Modified to handle Markdown
Merge branch 'markdown'
Refactored
Refactored