Amended templates
Added Markdown support