fixing link errors on readme file
some refactorings to use guava classes