Hook up stats again
Merge pull request #188 from square/dimitris/stats-again

Hook up stats again