Resolve conflict
Merge pull request #20 from rocketu/apis

Resolve conflict