More fix for issue 313 & 314
Merge pull request #1372 from 9rnsr/fix_imports

More fix for issue 313 & 314