Merge pull request #1 from leico/master

Bugfix:
詰まった