timing fixes hopefully.
Merge pull request #7 from marcusmichaels/master

timing fixes hopefully.