fix JSON response, thanks neoranga!
Merge remote-tracking branch 'upstream/master'