fix ConcurrentModificationException
fix mvn compilation errors
Merge pull request #26 from mcohen01/master

fix ConcurrentModificationException