Merge branch 'Set-Alarm-Feature'