Fixed event-bugs.
Merge pull request #25 from tholzschuh/master

Fixed event-bugs.