Statistics overhaul See merge request !12 (cherry picked from commit c7d1e6b0) b635a3ce Improve README.md