update to latest template changes
Merge pull request #14 from maratoid/master

update to latest template changes