Did some changes to alarm and email.
Merge pull request #44 from Agfct/alarmAndDiv

Did some changes to alarm and email.