Commit
Merge branch 'impl_inheritance'