Updated data_names and data_values
Merge pull request #238 from PseudoKnight/master

Updated data_names and data_values