Inheritance improvements. Fix #20