Merge pull request #364 from chris5560/master