Merge pull request #1 from julio/importer-progress

Importer progress
refactor and some other stuff