added JSON.stringify, fixed the issue that json data are passed in as an html string
Merge remote-tracking branch 'origin/master'