Re-add wrongly removed code
Merge pull request #11 from ctomc/classloading

Re-add wrongly removed code