Fix ConcurrentModificationException
Merge pull request #68 from KKBOX/master_daniel

Fix ConcurrentModificationException
Merge pull request #69 from KKBOX/master

Fix ConcurrentModificationException