Timer added
Merge branch 'hotfix/add_timer'