New link updates per Sheppy
Merge pull request #1080 from darkwing/link-updates

New link updates per Sheppy