fixes #2080
better CLI readability
Merge pull request #2240 from mastef/3.0-unstable

better CLI readability