fixed some issues with the api re-factor
Merge pull request #20 from tacaswell/fix-refactor

fixed some issues with the api re-factor