Fixed classloading on OSGi and other multi classloader environments
Merge pull request #1555 from noctarius/fix-osgi-classloading

Fixed classloading on OSGi and other multi classloader environments