fixed bug in import
Merge branch 'dev'