Merge pull request #2 from note103/master

marged test
Merge pull request #3 from note103/work

marged Merge pull request #2 from note103/master