Markup fixes
Merge pull request #78 from jmaas/master

Markup fixes