Merge branch 'devel' into devel2
Merge branch 'devel2' of https://github.com/miguelfmorales/FHD into devel2