Merge pull request #634 from chris5560/master