Fixed import when calling a seceond time and displaying of importfature
Merge branch 'feature/166' into develop