Merge pull request #490 from danvk/298-legend-follow