General links

This PR implements the changes that are detailed in issue #187.