Make use of a single bus, so that it's not possible to process more than a single message at once.
Merge branch 'release/0.0.5'