Merge pull request #3 from ahus1/FELIX-5076-fix-broken-links