Fix issue #33

This solves issue #33.
Please see full commit messages for further explanation.

P.S. I'm working on detecting more missing links, but I'll open a different issue for them, if you agree.