Merge pull request #805 from chris5560/master