updated API with tests
made merge changes
Merge pull request #17 from riachkyle/Nick

Nick