updates on hot and cold
Merge branch 'master' of https://github.com/leonla/leonla.github.com