Fix bug in import caused premature file-creation
Merge branch 'dev'