Merge pull request #1126 from chris5560/master