Issue 48

That's yet more stuff related to Classloader