Upgraded to Guava 16.0.1