data_* -> data
Merging upstream master
Merge pull request #336 from josenavas/data

Data