Use Selenium built in wait methods
Merge pull request #1037 from enricostano/master

Use Selenium built in wait methods