Stability fixes to import/export
Merge pull request #96 from reciprocity/feature/import_fixes

Fixes to import and export functionality.