api rework
Merge pull request #47 from mikey179/master

api rework