Bugfix for bug #54 (ConcurrentModificationError sometimes happens in Janeway)

I fixed bug #54 in this branch, please merge