merge with 1.8.1 + partial --version and --help