fixed bug where DataUtils was not renamed
Merge branch 'bug-fixes'