Added autostop option