Don't hang
Merge pull request #1 from Mechazawa/master

Fixed hanging issue