Fix up some cosmetic issue. Also fixed email delivery issue.
Merge pull request #22 from aries0420/kangie

Fix up some cosmetic issue. Also fixed email delivery issue.