diff --git a/DESCRIPTION b/DESCRIPTION
index bf61cd205c2036edee09fd8bc734ff9a64874ec2..6399e0364bd2736131c6f2d8170bfc67c9de846c 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.6.3.59
+Version: 1.6.3.60
 Date: 2020-11-16
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.md b/NEWS.md
index 1453cbd2aec40a170f33582e5724ade045508b4e..3ce055e68d48b76f80bce7b5af0e50ca78f9adf7 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,7 +4,7 @@
 
 
 
-### 1.6.3.59 Release Notes (2020-11-16)
+### 1.6.3.60 Release Notes (2020-11-16)
 
 #### New features
 
diff --git a/R/RunModel_GR2M.R b/R/RunModel_GR2M.R
index 65d5e1a30f5dc8606ffad8c3cb57d8584fa8262e..90255dbdee20076254e19b465debb518206949fe 100644
--- a/R/RunModel_GR2M.R
+++ b/R/RunModel_GR2M.R
@@ -7,19 +7,19 @@ RunModel_GR2M <- function(InputsModel, RunOptions, Param) {
   
   
   ## Arguments_check
-  if (inherits(InputsModel, "InputsModel") == FALSE) {
+  if (!inherits(InputsModel, "InputsModel")) {
     stop("'InputsModel' must be of class 'InputsModel'")
   }  
-  if (inherits(InputsModel, "monthly"    ) == FALSE) {
+  if (!inherits(InputsModel, "monthly"    )) {
     stop("'InputsModel' must be of class 'monthly'    ")
   }  
-  if (inherits(InputsModel, "GR"         ) == FALSE) {
+  if (!inherits(InputsModel, "GR"         )) {
     stop("'InputsModel' must be of class 'GR'         ")
   }  
-  if (inherits(RunOptions, "RunOptions"  ) == FALSE) {
+  if (!inherits(RunOptions, "RunOptions"  )) {
     stop("'RunOptions' must be of class 'RunOptions'  ")
   }  
-  if (inherits(RunOptions, "GR"          ) == FALSE) {
+  if (!inherits(RunOptions, "GR"          )) {
     stop("'RunOptions' must be of class 'GR'          ")
   }  
   if (!is.vector(Param) | !is.numeric(Param)) {
@@ -92,18 +92,18 @@ RunModel_GR2M <- function(InputsModel, RunOptions, Param) {
   
   ## Output_data_preparation
   ## OutputsModel_only
-  if (ExportDatesR == FALSE & ExportStateEnd == FALSE) {
+  if (!ExportDatesR & !ExportStateEnd) {
     OutputsModel <- lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i])
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR & ExportStateEnd == FALSE) {
+  if (ExportDatesR & !ExportStateEnd) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_SateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd) {
+  if (!ExportDatesR & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
diff --git a/R/RunModel_GR4H.R b/R/RunModel_GR4H.R
index 7090844b790b778a27b4759fc5025a559ae16e0f..9620a630115d193d776e0de0cf85d039e0ec3550 100644
--- a/R/RunModel_GR4H.R
+++ b/R/RunModel_GR4H.R
@@ -7,19 +7,19 @@ RunModel_GR4H <- function(InputsModel, RunOptions, Param) {
   
   
   ## Arguments_check
-  if (inherits(InputsModel, "InputsModel") == FALSE) {
+  if (!inherits(InputsModel, "InputsModel")) {
     stop("'InputsModel' must be of class 'InputsModel'")
   }  
-  if (inherits(InputsModel, "hourly"     ) == FALSE) {
+  if (!inherits(InputsModel, "hourly"     )) {
     stop("'InputsModel' must be of class 'hourly'     ")
   }  
-  if (inherits(InputsModel, "GR"         ) == FALSE) {
+  if (!inherits(InputsModel, "GR"         )) {
     stop("'InputsModel' must be of class 'GR'         ")
   }  
-  if (inherits(RunOptions, "RunOptions"  ) == FALSE) {
+  if (!inherits(RunOptions, "RunOptions"  )) {
     stop("'RunOptions' must be of class 'RunOptions'  ")
   }  
-  if (inherits(RunOptions, "GR"          ) == FALSE) {
+  if (!inherits(RunOptions, "GR"          )) {
     stop("'RunOptions' must be of class 'GR'          ")
   }  
   if (!is.vector(Param) | !is.numeric(Param)) {
@@ -97,18 +97,18 @@ RunModel_GR4H <- function(InputsModel, RunOptions, Param) {
   
   ## Output_data_preparation
   ## OutputsModel_only
-  if (ExportDatesR == FALSE & ExportStateEnd == FALSE) {
+  if (!ExportDatesR & !ExportStateEnd) {
     OutputsModel <- lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i])
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR & ExportStateEnd == FALSE) {
+  if (ExportDatesR & !ExportStateEnd) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_SateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd) {
+  if (!ExportDatesR & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
diff --git a/R/RunModel_GR4J.R b/R/RunModel_GR4J.R
index 9720662a855bda64465fb6b0108e993221ae727a..00e1f10ca79f33b24c3e419ed837b7797f4baf83 100644
--- a/R/RunModel_GR4J.R
+++ b/R/RunModel_GR4J.R
@@ -7,19 +7,19 @@ RunModel_GR4J <- function(InputsModel, RunOptions, Param) {
   
   
   ## Arguments_check
-  if (inherits(InputsModel, "InputsModel") == FALSE) {
+  if (!inherits(InputsModel, "InputsModel")) {
     stop("'InputsModel' must be of class 'InputsModel'")
   }  
-  if (inherits(InputsModel, "daily"      ) == FALSE) {
+  if (!inherits(InputsModel, "daily"      )) {
     stop("'InputsModel' must be of class 'daily'      ")
   }  
-  if (inherits(InputsModel, "GR"         ) == FALSE) {
+  if (!inherits(InputsModel, "GR"         )) {
     stop("'InputsModel' must be of class 'GR'         ")
   }  
-  if (inherits(RunOptions, "RunOptions"  ) == FALSE) {
+  if (!inherits(RunOptions, "RunOptions"  )) {
     stop("'RunOptions' must be of class 'RunOptions'  ")
   }  
-  if (inherits(RunOptions, "GR"          ) == FALSE) {
+  if (!inherits(RunOptions, "GR"          )) {
     stop("'RunOptions' must be of class 'GR'          ")
   }  
   if (!is.vector(Param) | !is.numeric(Param)) {
@@ -96,18 +96,18 @@ RunModel_GR4J <- function(InputsModel, RunOptions, Param) {
   
   ## Output_data_preparation
   ## OutputsModel_only
-  if (ExportDatesR == FALSE & ExportStateEnd == FALSE) {
+  if (!ExportDatesR & !ExportStateEnd) {
     OutputsModel <- lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i])
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR & ExportStateEnd == FALSE) {
+  if (ExportDatesR & !ExportStateEnd) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_StateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd) {
+  if (!ExportDatesR & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
diff --git a/R/RunModel_GR5H.R b/R/RunModel_GR5H.R
index e0f70bd11d8335854724ea11089ee82becd488e5..6291e7b1dbf36e5a4611f600fa6ace1582659ca1 100644
--- a/R/RunModel_GR5H.R
+++ b/R/RunModel_GR5H.R
@@ -13,19 +13,19 @@ RunModel_GR5H <- function(InputsModel, RunOptions, Param) {
   
   
   ## Arguments_check
-  if (inherits(InputsModel, "InputsModel") == FALSE) {
+  if (!inherits(InputsModel, "InputsModel")) {
     stop("'InputsModel' must be of class 'InputsModel'")
   }  
-  if (inherits(InputsModel, "hourly"     ) == FALSE) {
+  if (!inherits(InputsModel, "hourly"     )) {
     stop("'InputsModel' must be of class 'hourly'     ")
   }  
-  if (inherits(InputsModel, "GR"         ) == FALSE) {
+  if (!inherits(InputsModel, "GR"         )) {
     stop("'InputsModel' must be of class 'GR'         ")
   }  
-  if (inherits(RunOptions, "RunOptions"  ) == FALSE) {
+  if (!inherits(RunOptions, "RunOptions"  )) {
     stop("'RunOptions' must be of class 'RunOptions'  ")
   }  
-  if (inherits(RunOptions, "GR"          ) == FALSE) {
+  if (!inherits(RunOptions, "GR"          )) {
     stop("'RunOptions' must be of class 'GR'          ")
   }  
   if (!is.vector(Param) | !is.numeric(Param)) {
@@ -107,18 +107,18 @@ RunModel_GR5H <- function(InputsModel, RunOptions, Param) {
   
   ## Output_data_preparation
   ## OutputsModel_only
-  if (ExportDatesR == FALSE & ExportStateEnd == FALSE) {
+  if (!ExportDatesR & !ExportStateEnd) {
     OutputsModel <- lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i])
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR & ExportStateEnd == FALSE) {
+  if (ExportDatesR & !ExportStateEnd) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_StateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd) {
+  if (!ExportDatesR & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
diff --git a/R/RunModel_GR5J.R b/R/RunModel_GR5J.R
index 1af193e518864a3021dd2cb054a57a75cc6e181e..5322ea032c3b395b4c1c5bd9b91b4408f133f904 100644
--- a/R/RunModel_GR5J.R
+++ b/R/RunModel_GR5J.R
@@ -7,19 +7,19 @@ RunModel_GR5J <- function(InputsModel, RunOptions, Param) {
   
   
   ## Arguments_check
-  if (inherits(InputsModel, "InputsModel") == FALSE) {
+  if (!inherits(InputsModel, "InputsModel")) {
     stop("'InputsModel' must be of class 'InputsModel'")
   }  
-  if (inherits(InputsModel, "daily"      ) == FALSE) {
+  if (!inherits(InputsModel, "daily"      )) {
     stop("'InputsModel' must be of class 'daily'      ")
   }  
-  if (inherits(InputsModel, "GR"         ) == FALSE) {
+  if (!inherits(InputsModel, "GR"         )) {
     stop("'InputsModel' must be of class 'GR'         ")
   }  
-  if (inherits(RunOptions, "RunOptions"  ) == FALSE) {
+  if (!inherits(RunOptions, "RunOptions"  )) {
     stop("'RunOptions' must be of class 'RunOptions'  ")
   }  
-  if (inherits(RunOptions, "GR"          ) == FALSE) {
+  if (!inherits(RunOptions, "GR"          )) {
     stop("'RunOptions' must be of class 'GR'          ")
   }  
   if (!is.vector(Param) | !is.numeric(Param)) {
@@ -97,18 +97,18 @@ RunModel_GR5J <- function(InputsModel, RunOptions, Param) {
   
   ## Output_data_preparation
   ## OutputsModel_only
-  if (ExportDatesR == FALSE & ExportStateEnd == FALSE) {
+  if (!ExportDatesR & !ExportStateEnd) {
     OutputsModel <- lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i])
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR & ExportStateEnd == FALSE) {
+  if (ExportDatesR & !ExportStateEnd) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_SateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd) {
+  if (!ExportDatesR & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
diff --git a/R/RunModel_GR6J.R b/R/RunModel_GR6J.R
index 46e5fc8da26e2bdfe7874e40cfdbc2ccda26dd98..c5b9f4313f05b3ae5c91416e9135b76ced218233 100644
--- a/R/RunModel_GR6J.R
+++ b/R/RunModel_GR6J.R
@@ -7,19 +7,19 @@ RunModel_GR6J <- function(InputsModel, RunOptions, Param) {
   
   
   ## Arguments_check
-  if (inherits(InputsModel, "InputsModel") == FALSE) {
+  if (!inherits(InputsModel, "InputsModel")) {
     stop("'InputsModel' must be of class 'InputsModel'")
   }  
-  if (inherits(InputsModel, "daily"      ) == FALSE) {
+  if (!inherits(InputsModel, "daily"      )) {
     stop("'InputsModel' must be of class 'daily'      ")
   }  
-  if (inherits(InputsModel, "GR"         ) == FALSE) {
+  if (!inherits(InputsModel, "GR"         )) {
     stop("'InputsModel' must be of class 'GR'         ")
   }  
-  if (inherits(RunOptions, "RunOptions"  ) == FALSE) {
+  if (!inherits(RunOptions, "RunOptions"  )) {
     stop("'RunOptions' must be of class 'RunOptions'  ")
   }  
-  if (inherits(RunOptions, "GR"          ) == FALSE) {
+  if (!inherits(RunOptions, "GR"          )) {
     stop("'RunOptions' must be of class 'GR'          ")
   }  
   if (!is.vector(Param) | !is.numeric(Param)) {
@@ -102,18 +102,18 @@ RunModel_GR6J <- function(InputsModel, RunOptions, Param) {
   
   ## Output_data_preparation
   ## OutputsModel_only
-  if (ExportDatesR == FALSE & ExportStateEnd == FALSE) {
+  if (!ExportDatesR & !ExportStateEnd) {
     OutputsModel <- lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i])
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR & ExportStateEnd == FALSE) {
+  if (ExportDatesR & !ExportStateEnd) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_SateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd) {
+  if (!ExportDatesR & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")