Merge pull request #1 from nicklynchjonely/master

Update commit
Merge pull request #7 from ccarmen/master

Merge pull request #1 from nicklynchjonely/master