add feature: add timer
Merge branch 'development'