Merge pull request #544 from ndawe/master

[MRG] rm data subpackage