Updated HeaterCooler_u
Merge branch 'master' into issue313_fmi