Merge pull request #22 from bcail/master

fix some template errors