nikomatsakis Merge pull request #7 from petevine/patch-1 …