Fixed ConcurrentModificationException
testing working branch
Merge pull request #1 from zlot/working

Working