Merge pull request #1 from am11/super-markdown

Merge master, format code, code analysis