Upgrade to guava 18.0
Code optimization
Remove compilation warning