Fix deadlock
Merge branch 'master' of https://github.com/ileshenko/door_bell_1
Fix merge errors