fixing link errors on readme file
some refactorings to use guava classes
few ajustings
Merge pull request #11 from gustavopinto/master

few refactorings