Fix event structs errors
Merge pull request #84 from GuillaumeGomez/master

Fix event structs errors