more refactoring done and also added empty round flusher
Merge branch 'master' into statistics
Merge pull request #21 from nairys/statistics

more refactoring done and also added empty round flusher