Merged AlarmClock

Latest code merged with AlarmClock