Added support for catch all events
0.9.19
0.9.20
0.9.21