Markup fixes
Merge pull request #75 from jmaas/master

Markup fixes