FIXES issue with direct import (reverse order of input arguments)
Merge branch 'hotfix/v0.5.2'