A few changes to the AlarmHandler
Merge pull request #41 from Agfct/divStuff

A few changes to the AlarmHandler