Fix for #133 - inheritance support.