Damienpicard issue10 heating system

Damien, I think you can already merge this within your issue10 branch.  I keep on testing the coming days, probably making small contributions here and there.  I can then issue new pull requests :-)  git is soo funny when it works :-)