several improves, don't open file twice
removing print
Merge pull request #1493 from diegosarmentero/locator

Locator