API doc
Merge branch 'develop'