pullreq for #924

pullreq for #924
れびゅーおねがいします