Added extra data to the json and a default of max id
Merge remote-tracking branch 'origin/master'