Python class merged into master

Python class merged into master