test merge
Merge pull request #3 from sugimo/feature3

ok