Update broker to new rfc version
Merge pull request #10 from andreif/master

Update broker to new rfc version