fixes #13
Merge pull request #23 from carrot/fix-templateKeys

fix template keys