gfoot Merge branch 'medsouz_master' into master