Issue #238 Fixed event listener subscription
Merge pull request #243 from elcodi/hotfix/fix-event-subscription

Issue #238 Fixed event listener subscription