Markup tweak
More tweaks
Merge pull request #15 from crawley/master

Markup tweaks