Added JSON Parsing, Zlib
Merge remote-tracking branch 'origin/master'