Minor CS fixes
Merge branch 'master' of github.com:aztech-dev/event-bus
Update lock file
Fix merge conflict