Merge branch 'master' of https://github.com/iliantrifonov/Team-Guava.git