certik Merge pull request #27 from tkoyama010/tkoyama010-patch-2