Merge pull request #862 from chris5560/master