Merge pull request #666 from chris5560/master