Fixed EventListener with HeartbeatEvent
Merge branch 'master' of https://github.com/Timalkemade/playful-octo-bear