Aanlytics fixes
Merge pull request #232 from Icenium/fatme/fix-analytics

Aanlytics fixes