Fixed links. Fixes #1.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fixed links. Fixes #1.