Merge pull request #3 from dpwspoon/master

Initial working implementation
Merge remote-tracking branch 'origin/master' into develop