API comments for v2.0
Merge pull request #2396 from GeertDD/apidocs

API comments for v2.0