some refactoring and examples of different statistics
Merge remote-tracking branch 'origin/master'