Fixed #8
Fixed #7
All problems have been fixed with a concurrent map from Guava.