Merge pull request #1 from TiVo/ClassHierarchy

Pull TiVo:ClassHierarchy down to EBatTiVo:ClassHierarchy
Merge pull request #40 from EBatTiVo/ClassHierarchy

Merge pull request #1 from TiVo/ClassHierarchy