Update code and remove deprecation messages after the update to Guava 18.0
Merge pull request #639 from monzonj/latest2

Update code and remove deprecation messages after the update to Guava 18.0