Allow image to be specified explicitly.
Merge branch 'master' of https://github.com/EMSL-MSC/heat-templates