#341 Doc improvement