Merge pull request #501 from danvk/options-link