Merge pull request #16 from zorlius/stable

Fixes in Stable
Standard mail is sent by user 'system'
Merge pull request #17 from zorlius/master

Use correct sender for email.