pullreq for #808
Merge pull request #823 from minamiyama1994/808-minamiyama1994

pullreq for #808