Manually merged change to add auto-linking (see pull request #37) as this can no longer be auto-merged