Fix issues in APIs
Merge branch 'develop' into apis
Merge pull request #27 from rocketu/apis

Apis