Wrapping into data package
Merge branch 'datapackage'