Added email log handler
Merge branch 'master' into production