Add stop-command
Added wait-until-started flag