add user feedback in inheritance
Merge branch 'yboul_inheritance' into development