several improves in locator and files handler
Merge pull request #1762 from diegosarmentero/master

several improves in locator and files handler