Add metadata to received messages
Merge pull request #996 from hurtonm/master

Add metadata to received messages