Merge branch 'release/0.2.4' into develop
Improve emailing
Fix typo
Fix in template
Bump 0.2.5
Merge branch 'release/0.2.5'