bug fix
Merge branch 'devel' of github.com:miguelfmorales/FHD into devel