from yasu
Merge pull request #1 from yasusu31/master

from yasu