Merge pull request #764 from danvk/label_v