Merge pull request #275 from m8ttyB/update_locator

update locator, remove unused import