extended cli

implemmented issu #8 and #7