Take care of supernumerous $destroy events
Merge pull request #41 from ThomasWeiser/master

Take care of supernumerous $destroy events