Improve selenium script #209