Added wikitext und m2e features