Pull request #149 from @nelhage