Merge pull request #158 from horuslabsio/impl-analytics

Merge pull request #158 from horuslabsio/impl-analytics #440