addressing codereview
Merge branch 'fix-inheritence' into fix-MRO