Fixed help output
Minor changes in docs.
Manual merge
Manual merge
Merge branch 'fixes' into docs
Fixed conflicts