Updated timer logic
Merge pull request #4 from gfranko/update-timer-logic

Updated timer logic