version with timer
Merge pull request #1 from Shm13/timer

version with timer