More work on the API.
Merge pull request #5 from RiskyKen/develop

More work on the API.