Fixed links.

Closes #40, closes #35