Conflict solved + Classifier with plot-method
Merge remote-tracking branch 'origin/master'