Added Alarm Notification
merge with master