Merge pull request #2426 from ey6es/master

Add Ryan's updated smoothing factors.