pullreq for Issue #786
Merge pull request #816 from minamiyama1994/786-minamiyama1994

pullreq for Issue #786