Feature/fix docs

@smathieu