pullreq for #985
Merge pull request #987 from minamiyama1994/985-minamiyama1994