Clean up of import
Merge pull request #148 from reciprocity/feature/import_clean_up

Clean up of import to fix minor bugs