first iteration with locator and saving settings
Merge pull request #1489 from diegosarmentero/locator

first iteration with locator and saving settings