Merge pull request #2 from amandziy/dev

Some cosmetic changes.
Base decorator is used
Merge pull request #3 from amandziy/dev

Merge to master basic email service