Adds mail properly
Merge branch 'master' of github.com:jonathanyeong/tomcat