Bug fix: beam contours caused crash after last commit!
Merge branch 'master' into devel
Merge branch 'devel' of https://github.com/miguelfmorales/FHD into devel2