Bug Fixes
Merge branch 'master' of https://github.com/ssb402/Analytics

Pulling new changes