Merge pull request #16 from JacobAae/feature/update-events

Feature/update events