backup
Merge origin/master
added more stats