Merge pull request #664 from chris5560/master