Added rage quit support