[#469] Improve command line help