Fix: Proper JSON response
Merge remote-tracking branch 'origin/master'