Add myself as author.
Merge branch 'fix-events'