Merge pull request #865 from chris5560/master