Merge pull request #644 from chris5560/master