完善了一些异常
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/config.py
update