#661 - re-formated json structure by taking out spaces.
#661 - Seperated out the checks for object and then object.id.
#661 - Re-factored to handle the creating the content variable correctly.
Merge remote-tracking branch 'origin/t660' into t660