Merge pull request #1 from vagn/master

format fixes and more detail in the description of the options.
Merge pull request #1 from rmalley11/master

Merge pull request #1 from vagn/master