review 'CLASS'
Merge pull request #10 from CircleCode/3.2/review/Eric-Brison/classname

review