Merge pull request #156 from jerv13/master

Merge