Merge pull request #764 from chris5560/master