set messager as send only
nip
nip
remove pointer to map
remove duplicate logic
Merge pull request #74 from philips/cherry-pick-mistobaan

cherry pick out Mistobaan's patches