Added better Markdown support