Fixing exporter to look cleaner
Merge branch 'master' into deploy