Fixed #3 - JSON format now fully supported