Markup fixes
Merge pull request #77 from jmaas/master

Markup fixes