Fixed JSON parsing that I broke...
Merge remote-tracking branch 'origin/master'