refactored importer
changes
Merge pull request #3 from playon/master

Master