Merging changes.
Update documentation to proposed style.