add smooth stop before intersections
Merge branch 'master' into gh-pages