Merge pull request #1 from Hilaryous/clean_up

Clean up
Merge branch 'master' of github.com:hilaryous/event_reporter