template changes
Merge pull request #11 from maciek-slon/master

Template changes