mail fix
Merge branch 'master' of github.com:maxmax/clastgreat