Properly check time that is elapsed
Remove todo
Merge pull request #9 from redbeacon/timer-fix

Timer fix