api changes
Merge pull request #16 from mikey179/master

api changes