Added alarm receiver
merge