update

Conflicts:
	en2np.fun