Merge pull request #643 from chris5560/master