Closed #2
More robust link handling