Close GH-42: Bug fix automatic generation of mustache templates..