Fix event handler leak
Merge pull request #3 from parshap/patch-1

Fix event handler leak