Updated message bus.
Merge pull request #30 from sorniels/master

update