Fixed #53 - improved loading of classes.