Markup fixes 2
Merge pull request #57 from nfroidure/master

Markup fixes 2