Updates to API documentation.
Merge branch 'my'