Merge pull request #1075 from xepa/xepa-patch-1