finish spline of fEpsilon
Merge branch 'issue1'

Conflicts:
	707:1404-209/makeplot.py