locator/settings iteration2
Merge pull request #1490 from diegosarmentero/locator

locator/settings iteration2