getTemperature modified
merge fixed