Change beam defaults to match master branch
Merge branch 'devel' of https://github.com/miguelfmorales/FHD into devel