Export/import improvements and fixes
Merge pull request #535 from mposolda/master

Export/import improvements and fixes