Use GitHub flavored markdown
Merge branch 'hotfix/0.2.1'