Doc fix.
(cherry picked from commit 87f7f03)
Merge pull request #31 from faph/doc_fixes

Doc fix.
Merge remote-tracking branch 'upstream/master' into comments
Write @comment blocks.
Parse and write tests for comments.