Improved CLI documentation
Merge