- fixes
Merge remote-tracking branch 'FunctionIntegrator/master'