Image Importer code refactored.
Merge pull request #3 from jalessandro/master

Refactor