added smth after the break
Merge remote-tracking branch 'origin/timer_on_the_screen' into timer_on_the_screen