temp changes
merge google-cpi branch with fog master variant of google api