timing support
Merge pull request #1 from macie/patch-1

timing support