Fixed google analytics
Merged changes.