Add cf_fx_points and cf_fx_iteration
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages