nikomatsakis Merge pull request #102 from albins/master …