Merge pull request #13 from nacho-akqa/master

Templates logic