Fix & improvement
Merge branch 'master' of https://github.com/anthony101/event-manager