Fixes in markup
Merge pull request #170 from dpefour/master

Fixes in markup