Cover all types of locators
Merge pull request #18 from whhone/master

Cover all types of locators