Added Google Analytics fixes #22