Fine tunes the timing
Merge pull request #53 from tleung999/timing

Fine tunes the timing