Modifies creation of exports.
Merge pull request #394 from LearningLocker/issue/392

Modifies creation of exports.
Merge pull request #397 from LearningLocker/develop

Modifies creation of exports.