Merge branch 'proper-new-week' closes #3