rename the method to api
Merge branch 'master' into refactor