Feature/link rel support

Merging in the changes done by lloydmeta.