new branch: template update/links
update
Merge pull request #4 from Romtam/patch

merge commits from branch