Merge pull request #504 from philippwiesemann/update-links