Merge pull request #2 from mypower/master

Merge pull request #1 from mypower/fix-yyy
YROSIKU