#268 "\r\n" breaks headers in email
Merge branch 'version2.0' into version2.1