Updated api doc
Updated api doc
Merge branch 'develop'