make export plugin better
Merge pull request #35 from tocer/master

make export more better