Modified variable name from id to _id
Merge remote-tracking branch 'upstream/master'