Fixed a bug with smtp generator
Merge branch 'v1.1.0'