Merge pull request #2 from hldzlk/master

gen
Merge pull request #3 from hldzlk/master

genxin
dagen
Merge pull request #3 from mumuka/master

genxin