Merge pull request #616 from chris5560/master