修复了一个bug
Merge remote-tracking branch 'origin/bug'

Conflicts:
	README.md