Fix Event Handling
Merge branch '1.0.4b'