sangajala- fixed some issues in export
Merge remote-tracking branch 'origin/master'