updating firstpass
Merge branch 'master' of github.com:miguelfmorales/FHD
new version
new version
Fix merge conflict
Merge branch 'devel' into devel2