forgotten changes - constructor with classloader arg
Merge branch 'fix-Events'