Merge pull request #17 from mind1master/master

templates support