Merge pull request #744 from chris5560/master