fixes for google
Merge branch 'master' of https://github.com/vishsubs/stanenergy