Merge pull request #1 from y-undertree/master

fork from pull request test
Merge pull request #2 from y-undertree/master

my pull request merge ok b!
fork base test