Modified Locator class
Merge pull request #1 from vitalik-alliance/feature

Modified Locator class