Merge pull request #2 from hqucsx/master

update