pullreq for #999
Merge pull request #1014 from minamiyama1994/999-minamiyama1994

pullreq for #999