Adds Link-/Unlink-Annotations and extend the tests accordingly
Merge pull request #444 from benbender/link-annotation

Adds Link-/Unlink-Annotations and extend the tests accordingly