Merge pull request #507 from moneyball/patch-2