Improvements to API and functionality (fixes #6)
Merge pull request #7 from srizzling/api-improvements

Improvements to API and functionality (fixes #6)