Fix bug after finishing alarm and home is closed
Merge branch 'dev_1.0_issue45' into dev_1.0
merge dev_1.0 with dev_1.0_issue45