Fixed #4 - Support for event-bus