API doc, mixed param and new magic getters
Merge branch 'develop'