Doc strings added and a few formatting corrections.
Merge remote-tracking branch 'origin/master'