Merge pull request #1 from endymecy/master

rdds
Merge pull request #2 from shuyun-dev/master

Merge pull request #1 from endymecy/master