Ensure that the events are correctly removed by including the context. fixes #24
Update build.
Update CHANGELOG.