diff --git a/Regler/java_se.lth.control.Regler.spec b/Regler/java_se.lth.control.Regler.spec
index 087f7be54e87a6736bb0da19ae551c0a2c1aeaf5..b004d625c29b4277dcf1df2a2d4d07103c2383bc 100644
--- a/Regler/java_se.lth.control.Regler.spec
+++ b/Regler/java_se.lth.control.Regler.spec
@@ -3,8 +3,8 @@
 
 Name:		java_%{BASENAME}
 BuildArch:	noarch
-Version: 	2005
-Release:	2%{?dist}
+Version: 	2014
+Release:	1%{?dist}
 License:	GPL
 Summary:	Various java classes
 Group:		Programming Lanuages
diff --git a/Regler/src/Makefile b/Regler/src/Makefile
index 49fb394e2ebc538c2273cbc95c5b2fd38d44c5e6..554341e5b489843eeff5c99f96a5c5eb4b809260 100644
--- a/Regler/src/Makefile
+++ b/Regler/src/Makefile
@@ -1,4 +1,4 @@
-VERSION=2005
+VERSION=2014
 JARNAME=Regler
 NAME=java_se.lth.control.Regler
 TARFILE=$(NAME)-$(VERSION).tar.gz
diff --git a/Regler/src/se/lth/control/DoubleFormat.java b/Regler/src/se/lth/control/DoubleFormat.java
index a6caf1deab9d3fb6a91080775af7d8b36f2c5fd9..6430f470258457088d28ca602e9e7bbe27c5a7e2 100644
--- a/Regler/src/se/lth/control/DoubleFormat.java
+++ b/Regler/src/se/lth/control/DoubleFormat.java
@@ -3,7 +3,7 @@
  *
  *
  * Created: Wed Nov 25 10:27:51 1998
- * LastEditDate: 1999-09-16
+ * LastEditDate: 2014-12-19 Alfred Theorin -- consistent decimal separator, '.' is always required for input and should thus also always be used in formatted values.
  *
  */
 package se.lth.control;
@@ -171,6 +171,11 @@ public class DoubleFormat {
     df.setMaximumFractionDigits(numFrac);
     df.setGroupingUsed(false);
     df.setDecimalSeparatorAlwaysShown(true);
+    
+    DecimalFormatSymbols dfs = df.getDecimalFormatSymbols();
+    dfs.setDecimalSeparator('.');
+    df.setDecimalFormatSymbols(dfs);
+    
     return df;
   }
   private static final double ln10 = Math.log(10D);
diff --git a/Regler/src/se/lth/control/realtime/ConditionVariable.java b/Regler/src/se/lth/control/realtime/ConditionVariable.java
index 79ef7f57aeedee0d9f46c8c100038cb9628939e4..6890c2bb304595a5f0b5c23ce92e9e10b9712a28 100644
--- a/Regler/src/se/lth/control/realtime/ConditionVariable.java
+++ b/Regler/src/se/lth/control/realtime/ConditionVariable.java
@@ -3,6 +3,7 @@
  *
  * Created: 2000-09-12
  * LastEditDate: 2000-09-12
+ * LastEditDate: 2014-12-19 Alfred Theorin -- proper handling of InterruptedException
  *
  * @author 
  * @version
@@ -28,7 +29,9 @@ public class ConditionVariable {
 	    mutex.give();
 	    try {
 		wait();
-	    } catch (InterruptedException e) {}
+	    } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
         }
 	mutex.take();
     }