rizo Merge pull request #141 from XVilka/fixes

Update links, add missing ones

Latest commit c5ef49e

Aug 24, 2018