Part of statistics implemented
Merge remote-tracking branch 'origin/master'