add api documentation and change typo
Merge branch 'develop'
Merge branch 'master' into develop