Feature/webdriver 0.6.0