new locators
Merge branch 'master' into AlexanderSavenok