Commas in statistics
Merge branch 'timer'
Merge branch 'master' into timer