Fixed erronous link
Fixed linkd
Merge pull request #5 from juueli/master

Final touches