Merge pull request #2 from nicklynchjonely/master

New commit
Merge pull request #10 from ccarmen/master

Merge pull request #2 from nicklynchjonely/master