Merge pull request #233 from fabienrohrer/master

Reverted latest modifications about alarm