Merge pull request #29 from prakhar1989/master

updated with json data with right tests