Fixed some locators that have changed, added new functionalities
Merge branch 'integration-v2.0' into feature/loop_round_3
Merge pull request #512 from owdqa/feature/loop_round_3

Feature/loop round 3