Finalize first version
Finalize cli