Merge pull request #1 from cuiyu2012/master

my_creptor
cried
Merge pull request #1 from knightingal/master

update from knightingal