Improve CLI, release 1.0.0.