works without gnuplot
Merge remote-tracking branch 'andresy/master'