Merge pull request #1046 from zed0/master