update to latest templates
Merge pull request #16 from maratoid/master

update to latest templates