Yohans last patch applied
master branch cleanup (reverted to clean version - no custom mods)