Merge pull request #2 from note103/master

marged test