modify a little
Merge branch 'template'