Merge pull request #1 from cam-technologies/master

Updating fork