Merge pull request #5 from carharttjimmy/master

Merge pull request