Fix a bug & update templates
Merge pull request #1 from Junzki/master

Fix a bug & update templates