Feature/base command

merge with current develop