added alarms
rebase
Merge branch 'chansuke-master'