added in analytics code
Merge branch 'hotfix/analytics'