Feature/week namespace

Will resolve #108