Merge pull request #629 from chris5560/master