Merge pull request #1 from Trinea/master

hzy87emailmaster