pullreq for #950
Merge pull request #986 from minamiyama1994/950-minamiyama1994

pullreq for #950