added jsonparser
updated tests
Merge pull request #5 from cosmosgenius/move-to-json-parser

Move to json parser closes #3