Merge pull request #248 from chris5560/master