Fixes the issues for export
Merge pull request #197 from CharuChopra84/master

Fixes the issues for export