Merge pull request #1191 from chris5560/master