Merge pull request #90 from rosslagerwall/stat-improvements