Merge pull request #6 from nicklynchjonely/master

Get latest updates
Merge pull request #20 from ccarmen/master

Merge pull request #6 from nicklynchjonely/master