Bug fix: beam contours caused crash after last commit!
Merge branch 'master' into devel