Markup improvements
Merge pull request #1 from rnowm/master

Adding style changes from @rnowm