Merge master to issue 313 (for heater/cooler)

This merges the new heater/cooler.