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