bspline without error
final bspline version
Merge remote-tracking branch 'origin/master'