Update to Sender/Receiver
Merge pull request #19 from bjz/fix-build

Update to Sender/Receiver