#199 Added option to skip reset