Added CLI command
v0.9.21