Merge pull request #1 from ylh888/master

updates