Updates
Merge branch 'master' of https://github.com/DiegoGarza/EventFeed
fix