Merge branch 'master' of /home/user/Coding/tc-bp-plugin with conflicts.
minor refactoring of google metric