Switched to my stats implementation.
Merge branch 'dev'