Pull request: Changes for selenium