Merge pull request #39 from blabaere/master

AddsPub/Sub protocol
Merge remote-tracking branch 'upstream/master'