Merge pull request #5 from peculater/TAMAYA-382-link-updates

TAMAYA-382 link updates