mail support
test fixes
Merge pull request #31 from gsmirnoff/mail

Mail