Cleanup google module
Fixed silly merge bug
Merge branch 'master' into tkkrlab