Merge pull request #1 from wbond/master

Update
Update links
Merge pull request #3258 from evgeny-golubev/master

Update links