diff --git a/Makefile b/Makefile
index ca68a0052057e8eb0636bf6837e830306514eabb..5f5f06d72aaf725ffd5929c30d56321deb0eabd4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 BASE=ordernumber
 PLUGINTYPE=vmshopper
-VERSION=1.13
+VERSION=1.14
 
 PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html
 
diff --git a/ordernumber.php b/ordernumber.php
index de1ce52557d8863f0ad9f7d093b77ab583c5e5f0..cba1aa218aeac7f0eef59796031209baad1cf826 100644
--- a/ordernumber.php
+++ b/ordernumber.php
@@ -175,6 +175,7 @@ class plgVmShopperOrdernumber extends vmShopperPlugin {
           $global = $this->params->get ('order_number_global', 1);
           $padding = $this->params->get ('order_number_padding', 1);
           $ordernr = $this->format_number ($fmt, $orderDetails, $nrtype, $global, $padding);
+          // TODO: Check if ordernr already exists
           $orderDetails->order_number = $ordernr;
         }
         // Is order password customization enabled?
@@ -200,6 +201,7 @@ class plgVmShopperOrdernumber extends vmShopperPlugin {
                 $global = $this->params->get ('invoice_number_global', 1);
                 $padding = $this->params->get ('invoice_number_padding', 1);
                 $invoicenr = $this->format_number ($fmt, (object)$orderDetails, $nrtype, $global, $padding);
+                // TODO: Check if ordernr already exists
                 $data['invoice_number'] = $invoicenr;
                 return $data;
             }
@@ -216,6 +218,7 @@ class plgVmShopperOrdernumber extends vmShopperPlugin {
             $global = $this->params->get ('customer_number_global', 1);
             $padding = $this->params->get ('customer_number_padding', 1);
             $customernr = $this->format_number ($fmt, (object)$data, $nrtype, $global, $padding);
+            // TODO: Check if ordernr already exists
             $data['customer_number'] = $customernr;
             return $data;
         }
diff --git a/ordernumber.xml b/ordernumber.xml
index c62c0edaa058d5d338ca0cbdcc4793fedf5e9253..98c860b2cf0ceef06ef862a3876a4d2ba88a51ff 100644
--- a/ordernumber.xml
+++ b/ordernumber.xml
@@ -7,7 +7,7 @@
     <authorUrl>http://www.open-tools.net/</authorUrl>
     <copyright>Copyright (C) 2012-2014 Reinhold Kainhofer. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-3.0.html GNU/GPLv3</license>
-    <version>1.13</version>
+    <version>1.14</version>
     <releaseDate>2014-10-05</releaseDate>
     <releaseType>Minor update</releaseType>
     <downloadUrl>http://www.open-tools.net/virtuemart-2-extensions/vm2-ordernumber-plugin.html</downloadUrl>