Merge pull request #128 from Deiz/optional-webkit