Concurrent Modification Fix
Merge pull request #2 from y-higuchi/yoshi

Concurrent Modification Fix