support for custom classloading
Merge remote-tracking branch 'origin/master'