Added events
Merge branch 'master' of https://github.com/mail-tycoon/mail-tycoon