Fix links according to beminfo-698
Merge pull request #218 from jk708/fix-all-links

Fix links according to beminfo-698