API doc adjustments
Merge pull request #492 from dshurt/v1.2

API doc adjustments