Added missing description for the `when` config option
Merge remote-tracking branch 'andyet/pr/6' into gh-pages
whitespace cleanup
grammar cleanup