pullreq for #838
Merge pull request #856 from minamiyama1994/838-minamiyama1994

pullreq for #838