compile errors fixed
Merge pull request #2 from amirsh/data-master

Compile errors fixed