Updated api doc
Merge branch 'develop'
Merge pull request #1 from siad007/master

Master