Merge pull request #499 from moneyball/patch-1