Merge branch 'blabaere-master'
Merge pull request #36 from blabaere/master

Fixes broken build
Merge pull request #37 from blabaere/master

Adds the bus protocol
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'