Merge branch 'feature/more-api' of git://github.com/jabranr/public-apis into jabranr-feature/more-api