Merge pull request #7 from am11/super-markdown

  Merge: Resolved conflicts.