(cherry picked from commit 6943f95)
Merge pull request #7 from boda2004/separate-email

(cherry picked from commit 6943f95)