diff --git a/Makefile b/Makefile
index c2839b0b7655b235d9b5ae8c7a2584c5ef363d45..b1dadf7b656668a01fa764279511e38b7c43ab1d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 BASE=ordernumber
 PLUGINTYPE=vmshopper
-VERSION=3.0
+VERSION=3.1
 
 PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html $(BASE)/
 
diff --git a/ordernumber.php b/ordernumber.php
index 870d33c38e5dcc43f52f05393f453c1e509d6a47..5f03853691d09adc781a9afb255aed93e9956773 100644
--- a/ordernumber.php
+++ b/ordernumber.php
@@ -401,7 +401,7 @@ class plgVmShopperOrdernumber extends vmShopperPlugin {
 		// If a separate counter format is given after the |, use it, otherwise reuse the number format itself as counter format
 		$parts = explode ("|", $fmt);
 		$ctrsettings["${type}_format"] = $parts[0];
-		$ctrsettings["${type}_counter"] = ($ctrsettings["${type}_global"]=='yes')?"":$parts[(count($parts)>1)?1:0];
+		$ctrsettings["${type}_counter"] = ($ctrsettings["${type}_global"]==1)?"":$parts[(count($parts)>1)?1:0];
 		
 		return $ctrsettings;
 	}
diff --git a/ordernumber.xml b/ordernumber.xml
index 2a2995ce88d0251b983201ca90474c3a4c9b7b17..8a6d9226cbd7d951549ebc0df1b3ffbea2449f2b 100644
--- a/ordernumber.xml
+++ b/ordernumber.xml
@@ -5,11 +5,11 @@
     <author>Reinhold Kainhofer</author>
     <authorEmail>office@open-tools.net</authorEmail>
     <authorUrl>http://www.open-tools.net/</authorUrl>
-    <copyright>Copyright (C) 2012-2014 Reinhold Kainhofer. All rights reserved.</copyright>
+    <copyright>Copyright (C) 2012-2015 Reinhold Kainhofer. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-3.0.html GNU/GPLv3</license>
-    <version>3.0</version>
-    <releaseDate>2015-12-07</releaseDate>
-    <releaseType>Major update</releaseType>
+    <version>3.1</version>
+    <releaseDate>2015-05-23</releaseDate>
+    <releaseType>Minor update</releaseType>
     <downloadUrl>http://open-tools.net/virtuemart/advanced-ordernumbers.html</downloadUrl>
 
     <description>VMSHOPPER_ORDERNUMBER_DESC</description>
diff --git a/releases/plg_vmshopper_ordernumber_v3.1.zip b/releases/plg_vmshopper_ordernumber_v3.1.zip
new file mode 100644
index 0000000000000000000000000000000000000000..c61f5c871c34ff60156320a29af8115d91d6422d
Binary files /dev/null and b/releases/plg_vmshopper_ordernumber_v3.1.zip differ