Merge pull request #1693 from alex/update-docs

Updated docs for new API