Email sending
checking email works
Merge remote-tracking branch 'upstream/master'