new stuff
Merge remote branch 'origin/devel' into devel
Fix issues #78:
detector (default) mask not used in calibration: no mask was used