tets modif before merge
Merge branch 'master' of github.com:OleksandrKulchytskyi/EventBus
Make some changes , fix all compile-time issues.