Updated locators
Merge pull request #61 from AndreiH/update_locators

Updated locators