Merge pull request #1 from flv/master

youhou
modif youhou
Merge pull request #2 from acarchan/master

youhou HW