Testing email linkage
Fixed issues mentioned by Xudong
Merge branch 'master' into CMD