Merge pull request #2 from cam-technologies/master

Updating fork
Merge pull request #16 from chrislaughlin/master

Merge pull request #2 from cam-technologies/master