uchida commit
Merge pull request #2 from kiyomizu/uchida

uchida commit