Moved Analytics to header
Merge pull request #9 from db-pj/tweaks

Moved Analytics to header