API update
Merge pull request #81 from ikhudoshyn/api-update

API update