Enforce proper use of class'
Merge pull request #20 from birjolaxew/master

Enforce proper use of class'