Syncs bug fixes with newer IG2 version
Merge pull request #2 from stenbacka/improved-export-import

Syncs bug fixes with newer IG2 version