Improved event handling
0.5.1