Fixed the timer for good this time.
Merge pull request #43 from Rovanion/timer

Fixed the timer for good this time.