add andrewkett/locator
Merge PR 64