Update API
Merge pull request #99 from xboston/original-110

Update API