Merged Annex60, branch issue39_idealHeaterCooler