Fixed help output
Manual merge
Merge branch 'fixes' into docs