Merge request for #415

I've added the extra link, together with robot test and unit tests.