Code

Merge branch 'vb/sendemail'