Fixed the ConcurrentModificationException when tried to use under Java 8. Fixed some Errors which made this code not to Compile under Java 8