add stats
Merge remote-tracking branch 'origin/master' into develop
fix compile error due to merge