Python - Fixed some issues with the plotter
Merge remote-tracking branch 'origin/master'