Renamed Mail => Email [BC BREAK] [Issue #98]
onRegistred => onRegistered [BC BREAK] [Issue #98]
Merge commit '7e1b0d561abc0ed2594c704a131f237524b963be' into issue70