Factorizing event_type
Merge branch 'master' of https://github.com/steveoro/goggles
Merge branch 'master' of https://github.com/steveoro/goggles
Fix some typo