fixed wrong import command, removed trailing spaces
Merge branch 'master' into develop