Merge pull request #12 from ricarora/event

Event
Merge branch 'master' into weather