Minor changes: formatting, name corrections
Merge pull request #1 from walterl/master

Minor changes: formatting, name corrections