Updated link, added title
fixed merge conflict