bug fixes
Merge branch 'master' of github.com:benoitfragit/google2ubuntu