Added stuff for parsing wiki markup (copied from holmes)