pullreq for #1078
Merge pull request #1086 from minamiyama1994/1078-minamiyama1994

pullreq for #1078