made som polishing on the links
Merge branch 'Linksatmah' of local repository into dev