Issue 260 fix with importer

Signed-off-by: Sheik Hassan <solergiga@yahoo.com>
Importer almost works

Signed-off-by: Sheik Hassan <solergiga@yahoo.com>