this should fix the grid
Merge branch 'master' into splines
Fixed BSplines