merged in changes from master, fixed issue with currentweek