Seperated out analytics
Merge branch 'master' of https://github.com/tomfa/tekled