Fixes bug that prevented the un-registering of event handlers.  Closes #13.