added method to allow table to class mapping
Merge remote-tracking branch 'origin/master'