tweaked the export functionality again, I have no Windows OS so I can't
really tests if it works or not please let me know
Merge remote-tracking branch 'origin/master'