Merge pull request #376 from chris5560/master