fixed some export related issues (performance, etc.)
Merge pull request #622 from naturwerk/akaelin

fixed some export related issues (performance, etc.)