Merge API improvements
Merge pull request #7 from sjohnr/master

API improvements