stats struct refactoring
Merge pull request #207 from pavel-paulau/master

stats struct refactoring