data setup
Merge pull request #1 from sanele2010/master

data setup