Applies some fixes already fixes in other versions
Merge pull request #5 from stenbacka/bug-fixes-in-export-import

Applies some fixes already fixes in other versions