Merge pull request #36 from AntonStoeckl/doc-block-fixes

Doc block fixes
Merge branch 'upstream-master'