Merge pull request #610 from PolynomialDivision/fix/olsrdgpsd