Merge pull request #12 from jkczyz/2021-05-event-handler