Also works with inheritance, fixes part of #41 and #80

Also works with inheritance, fixes part of #41 and #80 #243