documentation
merged modification