Merge pull request #1 from zzl09/master

update2