ODAEU-330
Merge pull request #3 from devgateway/import-fixes-final

ODAEU-330