Added userInheritance implemementation
Merge branch 'Inheritance' into development