fix email bug
Merge branch 'master' of github.com:csmwelian/fed