Merge pull request #1 from clowwindy/master

update