API doc + new feature
Merge branch 'develop'