Merge pull request #199 from clinthowarth/master