support markdown
Merge branch 'marked'