Fixed bug with datasets.
Merge branch 'test' into dev