Merge pull request #7 from nicklynchjonely/master

update commits
Merge pull request #26 from ccarmen/master

Merge pull request #7 from nicklynchjonely/master