Added event tracking
Merge branch 'develop' of https://github.com/kyvkri/mg-git into develop