Restored latest modifications
Removed the not working alarm method
Used the id broadcast macro
Merge pull request #233 from fabienrohrer/master

Reverted latest modifications about alarm