write some unit-tests
Merge branch 'master' of https://github.com/magento-hackathon/MailGuard
write some unit-tests