Add EventBus Wrapper and fix unsubscribe method
Add EventBus Wrapper and fix unsubscribe method
Merge branch 'channel'