Update wrapper
Merge branch 'master' of https://github.com/miguelfmorales/FHD
Merge branch 'master' into devel