Implement timeout feature and disply dynamic badge numbers
Merge branch 'work-branch'