Add options to cal plots
Merge branch 'devel' into devel2