Markup fixes.
Merge pull request #97 from jmaas/master

Markup fixes.