Bug-fix
Documentation update