WIP
Merge branch 'fix-python-oop'