finished test of point is on curve
Merge remote-tracking branch 'origin/master'