Merge branch 'update-gridded-means' into 'master'

Updated computation and plotting of gridded means.

See merge request !14