Merge pull request #205 from ozbenh/timing