20141119 - Corrections to class list