Made some changes to the dataId creation. (refs issue #6)
Merge branch 'master' into dataId-temp