Merge pull request #4 from RiskyKen/develop

Develop
Merge pull request #5 from RiskyKen/develop

More work on the API.
Build 0.16.1