Added event tracking
Bug fixes
Merge pull request #1 from cferdinandi/development

Development