FOR BETTER
Merge pull request #1 from dodops/novclass

FOR BETTER