Removing Guava
Merge branch 'pr/15'