Merge branch 'root-finding'