final commit
Merge https://github.com/arikj/google-extension