pullreq for #885
Merge pull request #905 from minamiyama1994/885-minamiyama1994

pullreq for #885