changes from https://code.google.com/p/selenium/source/detail?r=8c3c65772d57
Merge pull request #44 from voodoo144/master

changes from https://code.google.com/p/selenium/source/detail?r=8c3c6577...