Update erng
Update erng
Merge branch 'master' into new

Conflicts:
	erng