Markup inprovements
Merge pull request #5 from rnowm/master

Markup improvements