Update wrappers
Check if callback before invoking it
Add support for buffer payloads
Merge pull request #1140 from andrerod/dev

Update wrappers