Added option to disable save command