Merge pull request #700 from chris5560/master