Fix requester/receiver with _id
Merge pull request #12 from LouisaBarrett/refactor

Fix requester/receiver with _id