Bugfix EventDispatcher

addresses issues mentioned in #20, #51 and #61