diff --git a/opentools-update-checker.php b/opentools-update-checker.php
index b01fa1d8b1dd2cf0a9f89de7d11f840cb2aeb00d..e28bb38b6f4dd53fe2297598d5c18ebdda448c59 100644
--- a/opentools-update-checker.php
+++ b/opentools-update-checker.php
@@ -23,6 +23,7 @@ class OpenToolsPluginUpdateChecker extends PluginUpdateChecker_2_1 {
 	public function __construct($metadataUrl, $pluginFile, $slug = '', $checkPeriod = 12, $optionName = '', $muPluginFile = '')
 	{
 		parent::__construct($metadataUrl, $pluginFile, $slug, $checkPeriod, $optionName, $muPluginFile);
+// 		$this->debugMode = true;
 		$this->installOTHooks();
 	}
 	public function declareCredentials($credential_def) {
diff --git a/ordernumbers_woocommerce.php b/ordernumbers_woocommerce.php
index e7cb21cb0cc38f62474c9b10b1a13486b3fc7b12..c2c1a152e65cf0fcfa253e823c7405295f01dfad 100644
--- a/ordernumbers_woocommerce.php
+++ b/ordernumbers_woocommerce.php
@@ -329,7 +329,25 @@ class OpenToolsOrdernumbers extends OpenToolsOrdernumbersBasic {
 	}
 
 	public function setupShippingReplacements(&$reps, $order, $nrtype) {
-// 		$reps["[shippingmethod]"] = $order->getShippingMethod();
+		$reps["[shipping]"] = $order->get_total_shipping();
+		$smethods = array();
+		$reps["[shippingmethodids]"] = array();
+		$reps["[shippingmethodtypes]"] = array();
+		$reps["[shippinginstanceids]"] = array();
+		foreach ($order->get_shipping_methods() as $ship) {
+			$smethods[] = $ship['name'];
+			$reps["[shippingmethodids]"][] = $ship['method_id'];
+			// With the shipping zones introduced in WC 2.6, the method_id
+			// contains the shipping method type and the instance ID separated
+			// by a :. If the ":" is not present, it is a legacy method and 
+			// has no instance ID.
+			$ids = explode(':', $ship['method_id'], 2);
+			$reps["[shippingmethodtypes]"][] = $ids[0];
+			if (isset($ids[1])) {
+				$reps["[shippinginstanceids]"][] = $ids[1];
+			}
+		}
+		$reps["[shippingmethods]"] = implode(", ", $smethods);
 	}
 	
 	/*public function setupInvoiceReplacements (&$reps, $invoice, $order, $nrtype) {
diff --git a/readme.txt b/readme.txt
index 66d9322d3d2298d9a2e1bc9fcfc05c56da1a49e3..c13b4df12a4dc5c23562a23701d0f62846cf66d4 100644
--- a/readme.txt
+++ b/readme.txt
@@ -80,6 +80,13 @@ The Advanced Ordernumbers for WooCommerce plugin supports some invoicing plugins
 
 = 1.3.7 =
 * Add support for PayPal payment method
+* Add variables:
+  * [UserRoles] (list of all WordPress user rules for the customer)
+  * [Shipping] (shipping costs)
+  * [ShippingMethods] (user-readable string)
+  * [ShippingMethodIDs] (internal, unique IDs for shiping methods, like shipping_by_rules:31)
+  * [ShippingMethodTypes] (shipping plugin names)
+  * [ShippingInstanceIDs] (unique identifiers for shipping instance when using zones)
 
 = 1.3.6 =
 * Fix order number display for old orders
diff --git a/releases/opentools-woocommerce-ordernumbers-advanced_v1.3.7.zip b/releases/opentools-woocommerce-ordernumbers-advanced_v1.3.7.zip
new file mode 100644
index 0000000000000000000000000000000000000000..96a83b134eabe3d4892ee956a2852223a709070d
Binary files /dev/null and b/releases/opentools-woocommerce-ordernumbers-advanced_v1.3.7.zip differ
diff --git a/releases/opentools-woocommerce-ordernumbers-basic_v1.3.7.zip b/releases/opentools-woocommerce-ordernumbers-basic_v1.3.7.zip
new file mode 100644
index 0000000000000000000000000000000000000000..a12f8b5ed05e4f359fd5d34e73cb50e0534c24aa
Binary files /dev/null and b/releases/opentools-woocommerce-ordernumbers-basic_v1.3.7.zip differ
diff --git a/woocommerce-advanced-ordernumbers.php b/woocommerce-advanced-ordernumbers.php
index 073fd297f89b1a00b810bd27a4a03f5af08eb537..8bfa2a4e3ea15e9774912c420b42c942332a8b27 100644
--- a/woocommerce-advanced-ordernumbers.php
+++ b/woocommerce-advanced-ordernumbers.php
@@ -3,7 +3,7 @@
  * Plugin Name: Woocommerce Advanced Ordernumbers
  * Plugin URI: http://open-tools.net/woocommerce/advanced-ordernumbers-for-woocommerce.html
  * Description: Lets the user freely configure the order numbers in WooCommerce.
- * Version: 1.3.6
+ * Version: 1.3.7
  * Author: Open Tools
  * Author URI: http://open-tools.net
  * Text Domain: woocommerce-advanced-ordernumbers
@@ -31,6 +31,8 @@ $myUpdateChecker = new OpenToolsPluginUpdateChecker(
     __FILE__,
     'woocommerce-advanced-ordernumbers'
 );
+// $myUpdateChecker ->debugMode = true;
+
 $myUpdateChecker->declareCredentials(array(
 	'order_number' => __('Order Number:'), 
 	'order_pass'   => __('Order Password:'),