Merge pull request #2 from thomasgwatson/google

Google
Merge branch 'master' into google