Merge pull request #603 from moneyball/patch-3