Link support broken
Merge pull request #80 from tmortagne/master

Fix bug in link support