Upgrade of Guava+Scannit (Fixes #104)