documentation
Merging release into master.