make template
Merge branch 'master' into issues-1-2-3