diff --git a/Makefile b/Makefile
index 44ffcc06dc71842589710a58ed0df3a7cfcbc7a9..bbd0b7cc259903c9edc70ce215d10be2be960393 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ BASE=rules_shipping
 BASE_ADV=rules_shipping_advanced
 PLUGINTYPE=vmshipment
 ZIPBASE=opentools_vm2
-VERSION=3.96
+VERSION=3.97
 
 PLUGINFILES=$(BASE).php $(BASE)_base.php $(BASE).script.php $(BASE).xml index.html
 PLUGINFILES_ADV=$(BASE_ADV).php $(BASE)_base.php $(BASE_ADV).script.php $(BASE_ADV).xml index.html
diff --git a/language/en-GB/en-GB.plg_vmshipment_rules_shipping.ini b/language/en-GB/en-GB.plg_vmshipment_rules_shipping.ini
old mode 100644
new mode 100755
diff --git a/language/en-GB/en-GB.plg_vmshipment_rules_shipping.sys.ini b/language/en-GB/en-GB.plg_vmshipment_rules_shipping.sys.ini
old mode 100644
new mode 100755
diff --git a/releases/plg_opentools_vm2_rules_shipping_advanced_v3.97.zip b/releases/plg_opentools_vm2_rules_shipping_advanced_v3.97.zip
new file mode 100644
index 0000000000000000000000000000000000000000..49a2320085c766b6d1b1480d039a459dc6eeec39
Binary files /dev/null and b/releases/plg_opentools_vm2_rules_shipping_advanced_v3.97.zip differ
diff --git a/releases/plg_opentools_vm2_rules_shipping_v3.97.zip b/releases/plg_opentools_vm2_rules_shipping_v3.97.zip
new file mode 100644
index 0000000000000000000000000000000000000000..18f7ad39aa2c13ed0dd78e35b88855dca973905c
Binary files /dev/null and b/releases/plg_opentools_vm2_rules_shipping_v3.97.zip differ
diff --git a/rules_shipping.xml b/rules_shipping.xml
index 348d38cc8905a7447c2f42dbafd5690c4f5f4333..eace41a31a331dd78f465fd772a080a6da64549e 100644
--- a/rules_shipping.xml
+++ b/rules_shipping.xml
@@ -6,7 +6,7 @@
     <authorUrl>http://www.open-tools.net</authorUrl>
     <copyright>Copyright (C) 2013, Reinhold Kainhofer</copyright>
     <license>GPL v3+</license>
-    <version>3.96</version>
+    <version>3.97</version>
     <description>VMSHIPMENT_RULES_DESC</description>
     <files>
 	<filename plugin="rules_shipping">rules_shipping.php</filename>
diff --git a/rules_shipping_advanced.xml b/rules_shipping_advanced.xml
index 3934b53cf50ccc354c6f78cc172aabf8d7ed6a29..ee0a926fa629aca90f680a32760f25079c374f0a 100644
--- a/rules_shipping_advanced.xml
+++ b/rules_shipping_advanced.xml
@@ -6,7 +6,7 @@
     <authorUrl>http://www.open-tools.net</authorUrl>
     <copyright>Copyright (C) 2013, Reinhold Kainhofer</copyright>
     <license>GPL v3+</license>
-    <version>3.95</version>
+    <version>3.97</version>
     <description>VMSHIPMENT_RULES_ADV_DESC</description>
     <files>
 	<filename plugin="rules_shipping_advanced">rules_shipping_advanced.php</filename>
diff --git a/rules_shipping_base.php b/rules_shipping_base.php
index 0148223b3ed29a34991fd0c7e92a61bf2784f9f7..34a1f98feb62b967a27456867c71d92a026baab5 100644
--- a/rules_shipping_base.php
+++ b/rules_shipping_base.php
@@ -585,7 +585,7 @@ class plgVmShipmentRules_Shipping_Base extends vmPSPlugin {
 	}
 	protected function getCartValues (VirtueMartCart $cart, $method, $cart_prices) {
 		$address = (($cart->ST == 0) ? $cart->BT : $cart->ST);
-		$zip = trim($address['zip']);
+		$zip = isset($address['zip'])?trim($address['zip']):'';
 		$cartvals = array('zip'=>$zip,
 				  'zip1'=>substr($zip,0,1),
 				  'zip2'=>substr($zip,0,2),
@@ -593,6 +593,7 @@ class plgVmShipmentRules_Shipping_Base extends vmPSPlugin {
 				  'zip4'=>substr($zip,0,4),
 				  'zip5'=>substr($zip,0,5),
 				  'zip6'=>substr($zip,0,6),
+				  'city'=>isset($address['city'])?trim($address['city']):'',
 				  'articles'=>$this->getOrderArticles($cart),
 				  'products'=>$this->getOrderProducts($cart),
 				  'amount'=>$cart_prices['salesPrice'],