Added stuff to the markup
More text formatting
Merge pull request #3 from programbo/bugfix/markup-fixes

Bugfix/markup fixes