3nd commit
Merge branch 'master' of github.com:adesaegher/heat-test