Edits to documentation per issues #190 and #191.
Trying to fix merge conflict in documentation.