Some tweaks for import controller
Merge pull request #56 from motin/import-controller-tweaks

Some tweaks for import controller