Fixed broken inheritance
Merge pull request #22 from nedmas/master

Fixed broken inheritance