Fix broken link
Resolve merge with Kevin's code.