Corrected import function code
Merge branch 'develop'