More fix for abusing import bug
Merge pull request #8 from tom-tan/morefix-abusing-import

More fix for abusing import bug
Merge branch 'master' into work