Test with BSplines.
Merge branch 'master' into fabian