mailhandler added in again
Merge branch 'master' of https://github.com/trosne/progU48