fix issue 53
fixed emergency bug
iss53 steady
Merge branch 'iss53'

Conflicts:
	dianden.txt