Merge pull request #20 from rzcoder/dev

Merging with dev
Revert to 2efa5c1976510612fc667c6217886e17680bd97c
Revert to 6cb15fcd643fefe937f0cd1980c817c2932773f1
initial export/import formats