Refactored week stat
Merge branch 'release'