Update to new version

Code lifted from Muncie Events codebase