fix ga code;
Merge branch 'fix-ga' into gh-pages