Clean and simplify import generation process.
Merge pull request #7 from sviperll/master

Clean and simplify import generation process.