fixed bug in import
Merge branch 'dev'
Merge pull request #231 from nZEDb/master

Master