fix comments and analitics
Merge remote-tracking branch 'origin/master' into megge