Code

Merge branch 'cb/send-email-help'