fix timer
Merge pull request #1 from kthorrez/master

Fixed timer