Fix bug already fixed in devel
Allow output of images showing the sidelobes
Fix merge conflicts