timing
webkit fix
Merge pull request #212 from mwernimont/master

timing