Minor editing.
Merged parallell changes.