Merge pull request #1 from 1272729223/master

update1
test3
merge pull requst #3 from xiaodong