Merge pull request #223 from chris5560/master