Merge pull request #372 from leider/master

replaced 'markdown' with 'marked' framework
Merge pull request #373 from leider/master

UI tweaks