Merge pull request #1 from cam-technologies/master

Updating fork
Merge pull request #12 from chrislaughlin/master

Merge pull request #1 from cam-technologies/master