Merge branch 'release/0.1'
Fix mail content type
Merge branch 'hotfix/0.1.1' into develop