stats and things
Merge branch 'master' into stats_working
Merge pull request #38 from nairys/stats_working

Stats working