Test Inheritance Complete
Merge origin/master