added some documentation
Merge for amend