Merge pull request #13 from carharttjimmy/master

Merge pull request