Merge pull request #11 from carharttjimmy/master

Merge pull request