bugfixes scatterplot
Merge remote-tracking branch 'origin/master'

"merge with local changes"