Payload can be added to the events.
Change EOL, recommitig
Code format
Merge branch 'develop'