Merge pull request #715 from chris5560/master