Addresses #141, patched a method to prevent a concurrent modification exception from occurring.