Moved send email to new method, speed improvements
Merge branch 'develop'