merge w. giulio (master)

perhaps also mention how to use the gnuplot file