Fix for #13: Fails with recent Guava versions
Merge pull request #14 from tomdz/master

Fix for #13: Fails with recent Guava versions