Markup fixes
Merge pull request #74 from jmaas/master

Markup fixes