Merge branch 'release/3.0.6.0' into develop
Allow plain text as markup option
Merge pull request #116 from sharoonthomas/develop

Allow plain text as markup option
Release version 3.0.6.1
Merge branch 'release/3.0.6.1'