Merge pull request #1 from yujiangshui/master

update
fantong update
chichichi
update
Merge branch 'bloveAmber-master'