update template handling
Merge branch 'master' of github.com:dmachi/dme