extended timing
Merge pull request #661 from john-hill/test-timing

extended timing