Update to the extend inheritance method
Merge pull request #36 from corburn/cleanup

Update to the extend inheritance method