ISSUE #3 & #5: First draft of the manual alarm
Merge branch 'master' into thomas
ISSUE #3: Some refactoring