Updated link, added title
Manual merge for conflict resolution

Chose the bottom one