Changes to stats
Merge branch 'master' into newStatsUpdates
Merge pull request #35 from CorbinFoucart/newStatsUpdates

New stats updates