Improve CLI help output

Fixes #47