Added support for JSON (unfortunately that required two libraries, feel free to clean that shizzle up xD)
Merge remote-tracking branch 'origin/master'