Fixes Document API compliance.
Merge pull request #463 from LearningLocker/issue/conformance-ryan2

Fixes Document API compliance.