Merge pull request #487 from moneyball/master