Fix bug
Put the current template in first place
Merge pull request #10 from JerryLocke/master

Put the current template in first place & fix bug