Merge pull request #14 from pemaxim/development

Exporter Improvements
Merge pull request #15 from pemaxim/development

Fixed merge confilcts
Merge remote-tracking branch 'upstream/development' into development