Moved from XML to JSON
Merge pull request #48 from dreisch/xml_json

Moved from XML to JSON