buncha stuff
Merge pull request #1 from ddavison/google

buncha stuff