Fixed Analytics
Merge pull request #21 from smo-key/dev

Fixed Analytics