GenericExporter imporovements
Merge pull request #385 from matthewadams/generic-exporter-improvements

GenericExporter improvements