Improved import and export of datasets.
Merge branch 'test' into dev