Added 'week' and 'time' to the columns variable. Close #64