updated documentation
weird case of merging, even though nothing was merged...