commit fixbug1.0
commit fixbug1.1
Merge branch 'bugfix1.1-sangcm' to master

Conflicts:
	fixbug.txt