diff --git a/install.xml b/install.xml
new file mode 100644
index 0000000..5d71920
--- /dev/null
+++ b/install.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<modification>
+	<name>CoinGate</name>
+	<code>coningate</code>
+	<version>3.1.3</version>
+	<author>Ivan</author>
+	<!-- Allow 4 characters in form validation -->
+	<file path="admin/controller/localisation/currency.php">
+		<operation>
+			<search><![CDATA[if (utf8_strlen($this->request->post['code']) != 3)]]></search>
+			<add position="replace"><![CDATA[if (!in_array(utf8_strlen($this->request->post['code']), array(3, 4)))]]></add>
+		</operation>
+	</file>
+</modification>
diff --git a/upload/admin/controller/extension/payment/coingate.php b/upload/admin/controller/extension/payment/coingate.php
index 95596ee..3a48c26 100644
--- a/upload/admin/controller/extension/payment/coingate.php
+++ b/upload/admin/controller/extension/payment/coingate.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once(DIR_SYSTEM . 'library/coingate/coingate-php/init.php');
+require_once(DIR_SYSTEM . 'library/vendor/coingate/init.php');
 
 class ControllerExtensionPaymentCoingate extends Controller {
   private $error = array();
diff --git a/upload/admin/model/extension/payment/coingate.php b/upload/admin/model/extension/payment/coingate.php
index 4991ff5..10e3872 100644
--- a/upload/admin/model/extension/payment/coingate.php
+++ b/upload/admin/model/extension/payment/coingate.php
@@ -12,6 +12,19 @@ public function install() {
       ) ENGINE=MyISAM DEFAULT COLLATE=utf8_general_ci;
     ");
 
+    // Modify the currency table to allow 4-character currency code
+    $query = $this->db->query("
+    SELECT character_maximum_length
+    FROM information_schema.columns
+    WHERE table_name = '" . DB_PREFIX . "currency' and column_name = 'code';
+    ");
+    if ((int)$query->row['character_maximum_length'] < 4) {
+      $this->db->query("
+        ALTER TABLE `" . DB_PREFIX . "currency`
+        MODIFY `code` VARCHAR(4) COLLATE utf8_general_ci NOT NULL;
+      ");
+    }
+
     $this->load->model('setting/setting');
 
     $defaults = array();
diff --git a/upload/catalog/controller/extension/payment/coingate.php b/upload/catalog/controller/extension/payment/coingate.php
index d27fbc8..1d05a30 100644
--- a/upload/catalog/controller/extension/payment/coingate.php
+++ b/upload/catalog/controller/extension/payment/coingate.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once(DIR_SYSTEM . 'library/coingate/coingate-php/init.php');
-require_once(DIR_SYSTEM . 'library/coingate/version.php');
+require_once(DIR_SYSTEM . 'library/vendor/coingate/init.php');
+require_once(DIR_SYSTEM . 'library/vendor/coingate/version.php');
 
 class ControllerExtensionPaymentCoingate extends Controller
 {
@@ -40,7 +40,7 @@ public function checkout()
             'callback_url' => $this->url->link('extension/payment/coingate/callback', array('cg_token' => $token), true),
             'success_url' => $this->url->link('extension/payment/coingate/success', array('cg_token' => $token), true),
             'title' => $this->config->get('config_meta_title') . ' Order #' . $order_info['order_id'],
-            'description' => join($description, ', '),
+            'description' => join(', ', $description),
             'token' => $token
         ));
 
diff --git a/upload/system/library/coingate/coingate-php/init.php b/upload/system/library/vendor/coingate/init.php
old mode 100755
new mode 100644
similarity index 100%
rename from upload/system/library/coingate/coingate-php/init.php
rename to upload/system/library/vendor/coingate/init.php
diff --git a/upload/system/library/coingate/coingate-php/lib/ApiError.php b/upload/system/library/vendor/coingate/lib/ApiError.php
old mode 100755
new mode 100644
similarity index 100%
rename from upload/system/library/coingate/coingate-php/lib/ApiError.php
rename to upload/system/library/vendor/coingate/lib/ApiError.php
diff --git a/upload/system/library/coingate/coingate-php/lib/CoinGate.php b/upload/system/library/vendor/coingate/lib/CoinGate.php
old mode 100755
new mode 100644
similarity index 100%
rename from upload/system/library/coingate/coingate-php/lib/CoinGate.php
rename to upload/system/library/vendor/coingate/lib/CoinGate.php
diff --git a/upload/system/library/coingate/coingate-php/lib/Exception.php b/upload/system/library/vendor/coingate/lib/Exception.php
old mode 100755
new mode 100644
similarity index 100%
rename from upload/system/library/coingate/coingate-php/lib/Exception.php
rename to upload/system/library/vendor/coingate/lib/Exception.php
diff --git a/upload/system/library/coingate/coingate-php/lib/Merchant.php b/upload/system/library/vendor/coingate/lib/Merchant.php
old mode 100755
new mode 100644
similarity index 100%
rename from upload/system/library/coingate/coingate-php/lib/Merchant.php
rename to upload/system/library/vendor/coingate/lib/Merchant.php
diff --git a/upload/system/library/coingate/coingate-php/lib/Merchant/Order.php b/upload/system/library/vendor/coingate/lib/Merchant/Order.php
old mode 100755
new mode 100644
similarity index 100%
rename from upload/system/library/coingate/coingate-php/lib/Merchant/Order.php
rename to upload/system/library/vendor/coingate/lib/Merchant/Order.php
diff --git a/upload/system/library/coingate/version.php b/upload/system/library/vendor/coingate/version.php
similarity index 100%
rename from upload/system/library/coingate/version.php
rename to upload/system/library/vendor/coingate/version.php