Base class love
Merge pull request #6 from WizardOfOgz/master

Add base_class where needed