Merge pull request #382 from chris5560/master