Fix analytics
Merge pull request #61 from luqmaan/dev

Fix analytics