Refactor of the eventname parsing
Merge branch 'master' of https://github.com/JosephClay/Signal