Merge pull request #3 from kenba/master

Get latest updates
Merge pull request #11 from stuartswift/master

Merge pull request #3 from kenba/master