Fixed bug in weekly balance
Merge branch 'gh8'