Merge branch 'chaot4-feature_include_more_options_in_help'