Merge pull request #30 from alexzaporozhets/analyticEvents

Analytic events
Merge pull request #31 from alexzaporozhets/analyticEvents

little fixes