added classes and main_stats
Merge remote-tracking branch 'origin/master'