Make type hierarchy corrections
Merge pull request #1 from rstoyanchev/type-hierarchy-correction

Make type hierarchy corrections