Merge pull request #1 from ysc/master

update