Fix macro conversion from wiki- to XML-markup
Merge pull request #2 from thoutenbos/master

Fix macro conversion from wiki- to XML-markup