Merge pull request #57 from lhein/master

upgrade to build 352 and guava 15