remove Type Error
remove Type Error
fix for inheritance
fix for inheritance
fix for inheritance
fix for inheritance
fix
Merge branch 'master' into develop
comment too see difference in memory