more on Timer.
Merge pull request #158 from romainfrancois/master

more on Timer.