Fix class inheritance
Merge pull request #88 from cbdr/fix-model-inheritance

Fix class inheritance
fixing a merge conflict. I SEE HOW IT IS!