Merge pull request #3 from dpwspoon/master

Initial working implementation
Merge remote-tracking branch 'origin/master' into develop
Merge pull request #5 from dpwspoon/develop

Catch up develop with master in prep for first release