chnges for mailer
Merge branch 'master' of https://github.com/rschumann/trialtask