fix the bug on master
fix the bug on issue002
Merge branch 'issue002'

Conflicts:
	a.txt