* improve stat tracking
Merge branch 'master' into production