#151 added 'class-' to auto-loading