Better image template
Merge origin/master
Various enhancements