diff --git a/README.md b/README.md
index 4b0fbdd..6119b54 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,26 @@ This extension is maintained by [PHOENIX MEDIA](http://www.phoenix-media.eu/), M
 Changelog
 ---------
 
+1.0.14
+- Fix issue #42: "foreigncosts" to "foreigncountrycosts" (Thanks to [sulabh](https://github.com/sulabh/Magento-CashOnDelivery/commit/c4bb65e374da3009cab92a982edad6b24e95ab88))
+
+1.0.13
+- Add locale "fr_FR" (Thanks to [MaWoScha](https://github.com/MaWoScha))
+- Improve locale "it_IT" (Thanks to [emiliolodigiani](https://github.com/emiliolodigiani/Magento-CashOnDelivery/commit/0fe069c8af3645db16c12825c1d06642c580b312))
+
+1.0.12
+- "SR-714 allow capture offline" (Thanks to [Pascal Querner](https://github.com/MSCG/Magento-CashOnDelivery/commit/75475a11d647f8f14c9a4de0654b068f6a9d079a))
+- Fixed "Display Zero Fee" in customer account order view" (Thanks to [idziakjakub](https://github.com/macopedia/Magento-CashOnDelivery/commit/ba0f39433f8cbae7cb79cd19a6da0c70d541e1c8) (#21))
+- Add "cod_fee", "base_cod_fee" attributes to webservices (Thanks to [tawfekov](https://github.com/tawfekov/Magento-CashOnDelivery/commit/db91efdf110a1b9114e9d9e232925f20d382ae32) (#33))
+- Update to better fit ECG/PSR-2 (Thanks to [sreichel](https://github.com/sreichel/Magento-CashOnDelivery/commit/bbaf06d84169675f6f84eba341e593265c9cf235))
+- Removed not used observer method (Thanks to [sreichel](https://github.com/sreichel/Magento-CashOnDelivery/commit/89cbd3c2d464e900c1c1ac3e00cbc8f8a09cade7))
+- Hide config options if module is disabled (Thanks to [sreichel](https://github.com/sreichel/Magento-CashOnDelivery/commit/a0ba5148f4f368fb4a553e416555ea10d213a0c6))
+- Fixed "Add Create Invoice Option - Add ability to configure that a cash on delivery order automatically create an invoice." (Thanks to [Flipmediaco](https://github.com/Flipmediaco/Magento-CashOnDelivery/commit/8ae36cffd3bbab8e61852810c21a3c3a558378b4) (#19))
+
+1.0.11
+- Add locale "en_GB" and "pt_PT"
+- Improve localization
+
 1.0.10
 - Implement issue #16: CoD refund now changeable
 
diff --git a/app/code/community/Phoenix/CashOnDelivery/Block/Adminhtml/Sales/Order/Create/Totals/Cod.php b/app/code/community/Phoenix/CashOnDelivery/Block/Adminhtml/Sales/Order/Create/Totals/Cod.php
index ea64503..f668f8a 100644
--- a/app/code/community/Phoenix/CashOnDelivery/Block/Adminhtml/Sales/Order/Create/Totals/Cod.php
+++ b/app/code/community/Phoenix/CashOnDelivery/Block/Adminhtml/Sales/Order/Create/Totals/Cod.php
@@ -20,7 +20,7 @@
 
 /**
  * COD fee Total Row Renderer
- * 
+ *
  */
 class Phoenix_CashOnDelivery_Block_Adminhtml_Sales_Order_Create_Totals_Cod extends Mage_Adminhtml_Block_Sales_Order_Create_Totals_Default
 {
diff --git a/app/code/community/Phoenix/CashOnDelivery/Block/Checkout/Cod.php b/app/code/community/Phoenix/CashOnDelivery/Block/Checkout/Cod.php
index d3681c3..f970ce6 100644
--- a/app/code/community/Phoenix/CashOnDelivery/Block/Checkout/Cod.php
+++ b/app/code/community/Phoenix/CashOnDelivery/Block/Checkout/Cod.php
@@ -20,7 +20,7 @@
 
 /**
  * COD fee Total Row Renderer
- * 
+ *
  */
 class Phoenix_CashOnDelivery_Block_Checkout_Cod extends Mage_Checkout_Block_Total_Default
 {
diff --git a/app/code/community/Phoenix/CashOnDelivery/Block/Form.php b/app/code/community/Phoenix/CashOnDelivery/Block/Form.php
index c852ae5..d6c3469 100644
--- a/app/code/community/Phoenix/CashOnDelivery/Block/Form.php
+++ b/app/code/community/Phoenix/CashOnDelivery/Block/Form.php
@@ -38,7 +38,7 @@ public function getShippingAddress()
         return $this->getQuote()->getShippingAddress();
     }
 
-    public function convertPrice($price, $format=false, $includeContainer = true)
+    public function convertPrice($price, $format = false, $includeContainer = true)
     {
         return $this->getQuote()->getStore()->convertPrice($price, $format, $includeContainer);
     }
diff --git a/app/code/community/Phoenix/CashOnDelivery/Block/Info.php b/app/code/community/Phoenix/CashOnDelivery/Block/Info.php
index b2f638e..82d2202 100644
--- a/app/code/community/Phoenix/CashOnDelivery/Block/Info.php
+++ b/app/code/community/Phoenix/CashOnDelivery/Block/Info.php
@@ -48,8 +48,9 @@ public function getRawCodFee()
     public function getCodFeeExclTax()
     {
         if ($_dataObject = $this->_getDataObject()) {
-            $extraFeeExcl = $_dataObject->getCodFee() ? $this->_getPriceModel()->formatPrice($_dataObject->getCodFee()) : null;
-            return $extraFeeExcl;
+            if ($_dataObject->getCodFee()) {
+                return $this->_getPriceModel()->formatPrice($_dataObject->getCodFee());
+            }
         }
         return null;
     }
@@ -57,8 +58,9 @@ public function getCodFeeExclTax()
     public function getCodFeeInclTax()
     {
         if ($_dataObject = $this->_getDataObject()) {
-            $extraFeeIncl = $_dataObject->getCodFee() ? $this->_getPriceModel()->formatPrice($_dataObject->getCodFee()+$_dataObject->getCodTaxAmount()) : null;
-            return $extraFeeIncl;
+            if ($_dataObject->getCodFee()) {
+                return $this->_getPriceModel()->formatPrice($_dataObject->getCodFee() + $_dataObject->getCodTaxAmount());
+            }
         }
         return null;
     }
@@ -66,7 +68,6 @@ public function getCodFeeInclTax()
     protected function _getDataObject()
     {
         if (!isset($this->_dataObject)) {
-
             $dataObject = $this->getInfo()->getQuote();
 
             if (!is_object($dataObject)) {
@@ -81,7 +82,6 @@ protected function _getDataObject()
     protected function _getPriceModel()
     {
         if (!isset($this->_priceModel)) {
-
             $quote      = $this->getInfo()->getQuote();
             $priceModel = null;
 
diff --git a/app/code/community/Phoenix/CashOnDelivery/Block/Totals/Abstract.php b/app/code/community/Phoenix/CashOnDelivery/Block/Totals/Abstract.php
index 9887ae9..eeb7496 100644
--- a/app/code/community/Phoenix/CashOnDelivery/Block/Totals/Abstract.php
+++ b/app/code/community/Phoenix/CashOnDelivery/Block/Totals/Abstract.php
@@ -44,7 +44,7 @@ public function initTotals()
     {
         $this->_prepareTotals();
 
-        if ($this->_totalObject && $this->_totalObject->getCodFee()) {
+        if ($this->_totalObject && $this->_totalObject->getCodFee() && Mage::getStoreConfigFlag('payment/phoenix_cashondelivery/display_zero_fee')) {
             $label     = $this->__('Cash on Delivery fee');
             $value     = $this->_totalObject->getCodFee();
             $baseValue = $this->_totalObject->getBaseCodFee();
diff --git a/app/code/community/Phoenix/CashOnDelivery/Helper/Data.php b/app/code/community/Phoenix/CashOnDelivery/Helper/Data.php
index 5ec4fa5..d010f7d 100644
--- a/app/code/community/Phoenix/CashOnDelivery/Helper/Data.php
+++ b/app/code/community/Phoenix/CashOnDelivery/Helper/Data.php
@@ -23,9 +23,9 @@ class Phoenix_CashOnDelivery_Helper_Data extends Mage_Core_Helper_Data
     /**
      * Config path constants
      */
-    const CONFIG_XML_PATH_COD_TAX_CLASS = 'tax/classes/phoenix_cashondelivery_tax_class';
+    const CONFIG_XML_PATH_COD_TAX_CLASS    = 'tax/classes/phoenix_cashondelivery_tax_class';
     const CONFIG_XML_PATH_COD_INCLUDES_TAX = 'tax/calculation/phoenix_cashondelivery_includes_tax';
-    const CONFIG_XML_PATH_DISPLAY_COD = 'tax/display/phoenix_cashondelivery_fee';
+    const CONFIG_XML_PATH_DISPLAY_COD      = 'tax/display/phoenix_cashondelivery_fee';
 
 
     /**
@@ -54,7 +54,7 @@ class Phoenix_CashOnDelivery_Helper_Data extends Mage_Core_Helper_Data
      */
     public function codPriceIncludesTax($store = null)
     {
-        $store = Mage::app()->getStore($store);
+        $store   = Mage::app()->getStore($store);
         $storeId = $store->getId();
 
         if (!isset($this->_codPriceIncludesTax[$storeId])) {
@@ -139,10 +139,10 @@ public function getTotalAfterPosition()
     {
         if (!$this->_getTotalAfterPosition) {
 
-            $config = Mage::app()->getConfig()->getXpath('//sales/totals_sort');
-            $positions = end($config);
-            $positions = $positions->asArray();
-            $codPos = $positions['phoenix_cashondelivery'];
+            $config      = Mage::app()->getConfig()->getXpath('//sales/totals_sort');
+            $positions   = end($config);
+            $positions   = $positions->asArray();
+            $codPos      = $positions['phoenix_cashondelivery'];
             $beforeTotal = 'subtotal';
 
             asort($positions);
diff --git a/app/code/community/Phoenix/CashOnDelivery/Model/CashOnDelivery.php b/app/code/community/Phoenix/CashOnDelivery/Model/CashOnDelivery.php
index 4bef240..9523445 100644
--- a/app/code/community/Phoenix/CashOnDelivery/Model/CashOnDelivery.php
+++ b/app/code/community/Phoenix/CashOnDelivery/Model/CashOnDelivery.php
@@ -31,10 +31,13 @@ class Phoenix_CashOnDelivery_Model_CashOnDelivery extends Mage_Payment_Model_Met
     protected $_code                    = 'phoenix_cashondelivery';
     protected $_canUseForMultishipping  = false;
 
+    protected $_canCapture        = true;
+    protected $_canCapturePartial = true;
+
     protected $_formBlockType = 'phoenix_cashondelivery/form';
     protected $_infoBlockType = 'phoenix_cashondelivery/info';
 
-    protected $_costCalcBase = 'subtotal_incl_tax';
+    protected $_costCalcBase  = 'subtotal_incl_tax';
 
     /**
      * Get the configured inland fee.
@@ -57,7 +60,7 @@ public function getInlandCosts($address = null)
      */
     public function getForeignCountryCosts($address = null)
     {
-        return $this->getCosts($address, 'foreigncosts');
+        return $this->getCosts($address, 'foreigncountrycosts');
     }
 
     /**
@@ -69,7 +72,7 @@ public function getForeignCountryCosts($address = null)
      */
     public function getCosts($address, $type)
     {
-        $cost = $this->getConfigData($type);
+        $cost    = $this->getConfigData($type);
         $minCost = $this->getConfigData("minimum_$type");
 
         if (is_object($address) && Mage::getStoreConfigFlag(self::XML_CONFIG_PATH_CASHONDELIVERY_COST_TYPE)) {
diff --git a/app/code/community/Phoenix/CashOnDelivery/Model/Observer.php b/app/code/community/Phoenix/CashOnDelivery/Model/Observer.php
index 01d9179..794918d 100644
--- a/app/code/community/Phoenix/CashOnDelivery/Model/Observer.php
+++ b/app/code/community/Phoenix/CashOnDelivery/Model/Observer.php
@@ -26,8 +26,8 @@ class Phoenix_CashOnDelivery_Model_Observer extends Mage_Core_Model_Abstract
      * @param Varien_Event_Observer $observer
      * @return Phoenix_CashOnDelivery_Model_Observer
      */
-    public function sales_quote_collect_totals_after(Varien_Event_Observer $observer) 
-    {        
+    public function salesQuoteCollectTotalsAfter(Varien_Event_Observer $observer) 
+    {
         $quote = $observer->getEvent()->getQuote();
         $data  = $observer->getInput();
 
@@ -51,11 +51,11 @@ public function sales_quote_collect_totals_after(Varien_Event_Observer $observer
      * @param Varien_Event_Observer $observer
      * @return Phoenix_CashOnDelivery_Model_Observer
      */
-    public function sales_order_payment_place_end(Varien_Event_Observer $observer) 
-    {        
+    public function salesOrderPaymentPlaceEnd(Varien_Event_Observer $observer) 
+    {
         $payment = $observer->getPayment();
         if ($payment->getMethodInstance()->getCode() != 'phoenix_cashondelivery') {
-            return $this;;
+            return $this;
         }
 
         $order = $payment->getOrder();
@@ -74,36 +74,13 @@ public function sales_order_payment_place_end(Varien_Event_Observer $observer)
         return $this;
     }
 
-    /**
-     * Performs order_create_loadBlock response update
-     * adds totals block to each response
-     * This function is deprecated, the totals block update is implemented
-     * in phoenix/cashondelivery/sales.js (SalesOrder class extension)
-     * 
-     * @param Varien_Event_Observer $observer
-     * @return Phoenix_CashOnDelivery_Model_Observer
-     */
-    public function controller_action_layout_load_before(Varien_Event_Observer $observer) 
-    {        
-        $action = $observer->getAction();
-
-        if ($action->getFullActionName() != 'adminhtml_sales_order_create_loadBlock' || !$action->getRequest()->getParam('json')) {
-            return $this;
-        }
-
-        $layout = $observer->getLayout();
-        $layout->getUpdate()->addHandle('adminhtml_sales_order_create_load_block_totals');
-
-        return $this;
-    }
-
     /**
      * When the order gets canceled we put the Cash on Delivery fee and tax also in the canceled columns.
      *
      * @param Varien_Event_Observer $observer
      * @return Phoenix_CashOnDelivery_Model_Observer
      */
-    public function order_cancel_after(Varien_Event_Observer $observer)
+    public function orderCancelAfter(Varien_Event_Observer $observer)
     {
         $order = $observer->getEvent()->getOrder();
 
@@ -116,7 +93,7 @@ public function order_cancel_after(Varien_Event_Observer $observer)
         $codTax     = $order->getCodTaxAmount();
         $baseCodTax = $order->getBaseCodTaxAmount();
 
-        $codFeeInvoiced     = $order->getCodFeeInvoiced();
+        $codFeeInvoiced = $order->getCodFeeInvoiced();
 
         if ($codFeeInvoiced) {
             $baseCodFeeInvoiced = $order->getBaseCodFeeInvoiced();
@@ -139,4 +116,37 @@ public function order_cancel_after(Varien_Event_Observer $observer)
 
         return $this;
     }
-}
+
+
+    /**
+     * Invoice and set status to Cash On Delivery if order payment type is Cash on Delivery
+     *
+     * @author: https://github.com/Flipmediaco/Magento-CashOnDelivery/blob/8ae36cffd3bbab8e61852810c21a3c3a558378b4/app/code/community/Phoenix/CashOnDelivery/Model/Observer.php
+     * @param Varien_Event_Observer $observer
+     * @return void
+     */
+    public function invoiceCashOnDelivery($observer)
+    {
+		// Get order
+		$order = $observer->getEvent()->getOrder();
+    	
+		// If order is instance of Phoenix_CashOnDelivery_Model_CashOnDelivery
+		if ($order->getPayment()->getMethodInstance()->getCode() == 'phoenix_cashondelivery' && 
+			// Can be invoiced
+			$order->canvoice() &&
+			// order_invoice is true
+			Mage::getStoreConfig('payment/phoenix_cashondelivery/order_invoice')) {
+			// Prepare invoice
+			$invoice = Mage::getModel('sales/service_order', $order)->prepareInvoice();
+			// Set capture case - OFFLINE
+			$invoice->setRequestedCaptureCase(Mage_Sales_Model_Order_Invoice::CAPTURE_OFFLINE);
+			$invoice->register();
+			//
+			// Save transaction
+			$transactionSave =	Mage::getModel('core/resource_transaction')
+								->addObject($invoice)
+								->addObject($invoice->getOrder());
+			$transactionSave->save();
+		}
+    }
+}
\ No newline at end of file
diff --git a/app/code/community/Phoenix/CashOnDelivery/Model/Sales/Pdf/Cod.php b/app/code/community/Phoenix/CashOnDelivery/Model/Sales/Pdf/Cod.php
index 5bb8a77..0e52bca 100644
--- a/app/code/community/Phoenix/CashOnDelivery/Model/Sales/Pdf/Cod.php
+++ b/app/code/community/Phoenix/CashOnDelivery/Model/Sales/Pdf/Cod.php
@@ -39,7 +39,7 @@ public function getTotalsForDisplay()
         $fontSize      = $this->getFontSize() ? $this->getFontSize() : 7;
         $helper        = Mage::helper('phoenix_cashondelivery');
 
-        if ($helper->displayCodBothPrices()){
+        if ($helper->displayCodBothPrices()) {
             $totals = array(
                 array(
                     'amount'    => $this->getAmountPrefix().$amount,
diff --git a/app/code/community/Phoenix/CashOnDelivery/Model/Sales/Quote/TaxTotal.php b/app/code/community/Phoenix/CashOnDelivery/Model/Sales/Quote/TaxTotal.php
index 0291728..eea06cc 100644
--- a/app/code/community/Phoenix/CashOnDelivery/Model/Sales/Quote/TaxTotal.php
+++ b/app/code/community/Phoenix/CashOnDelivery/Model/Sales/Quote/TaxTotal.php
@@ -33,7 +33,7 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
             return $this;
         }
 
-        $store = $address->getQuote()->getStore();        
+        $store = $address->getQuote()->getStore();
 
         $items = $address->getAllItems();
         if (!count($items)) {
@@ -93,7 +93,7 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
     }
 
     public function fetch(Mage_Sales_Model_Quote_Address $address)
-    {        
+    {
         $store = $address->getQuote()->getStore();
         /**
          * Modify subtotal
@@ -105,7 +105,7 @@ public function fetch(Mage_Sales_Model_Quote_Address $address)
             } else {
                 $subtotalInclTax = $address->getSubtotal()+ $address->getTaxAmount() -
                     $address->getShippingTaxAmount() - $address->getCodTaxAmount();
-            }            
+            }
 
             $address->addTotal(
                 array(
diff --git a/app/code/community/Phoenix/CashOnDelivery/Model/Sales/Quote/Total.php b/app/code/community/Phoenix/CashOnDelivery/Model/Sales/Quote/Total.php
index 61c5993..798b00c 100644
--- a/app/code/community/Phoenix/CashOnDelivery/Model/Sales/Quote/Total.php
+++ b/app/code/community/Phoenix/CashOnDelivery/Model/Sales/Quote/Total.php
@@ -43,7 +43,7 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
             return $this;
         }
 
-        $baseTotal = $address->getBaseGrandTotal();        
+        $baseTotal = $address->getBaseGrandTotal();
 
         $baseCodFee = $paymentMethod->getAddressCodFee($address);
 
@@ -68,14 +68,14 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
         //Updating cod tax if it is already included into a COD fee
         $baseCodTaxAmount = $paymentMethod->getAddressCodTaxAmount($address);
         $address->setBaseCodTaxAmount($baseCodTaxAmount);
-        $address->setCodTaxAmount($store->convertPrice($baseCodTaxAmount, false));       
+        $address->setCodTaxAmount($store->convertPrice($baseCodTaxAmount, false));
 
         return $this;
     }
 
     public function fetch(Mage_Sales_Model_Quote_Address $address)
     {
-        $amount = $address->getCodFee();        
+        $amount = $address->getCodFee();
         if ($amount!=0) {
             $quote = $address->getQuote();
             $address->addTotal(
diff --git a/app/code/community/Phoenix/CashOnDelivery/Model/Source/AvailableShipmentMethods.php b/app/code/community/Phoenix/CashOnDelivery/Model/Source/AvailableShipmentMethods.php
index 677bda8..178eabb 100644
--- a/app/code/community/Phoenix/CashOnDelivery/Model/Source/AvailableShipmentMethods.php
+++ b/app/code/community/Phoenix/CashOnDelivery/Model/Source/AvailableShipmentMethods.php
@@ -24,7 +24,7 @@ public function toOptionArray()
     {
         $options =  array();
 
-        foreach (Mage::app()->getStore()->getConfig('carriers') as $code => $carrier) {            
+        foreach (Mage::app()->getStore()->getConfig('carriers') as $code => $carrier) {
             if ($carrier['active'] && isset($carrier['title'])) {
                 $options[] = array(
                     'value' => $code,
diff --git a/app/code/community/Phoenix/CashOnDelivery/etc/config.xml b/app/code/community/Phoenix/CashOnDelivery/etc/config.xml
index 86ed3ae..bd19bcf 100644
--- a/app/code/community/Phoenix/CashOnDelivery/etc/config.xml
+++ b/app/code/community/Phoenix/CashOnDelivery/etc/config.xml
@@ -23,7 +23,7 @@
 <config>
     <modules>
         <Phoenix_CashOnDelivery>
-            <version>1.0.10</version>
+            <version>1.0.14</version>
         </Phoenix_CashOnDelivery>
     </modules>
 
@@ -119,7 +119,7 @@
                     <phoenix_cashondelivery>
                         <type>singleton</type>
                         <class>phoenix_cashondelivery/observer</class>
-                        <method>sales_quote_collect_totals_after</method>
+                        <method>salesQuoteCollectTotalsAfter</method>
                     </phoenix_cashondelivery>
                 </observers>
             </sales_quote_collect_totals_after>
@@ -128,7 +128,7 @@
                     <phoenix_cashondelivery>
                         <type>singleton</type>
                         <class>phoenix_cashondelivery/observer</class>
-                        <method>sales_order_payment_place_end</method>
+                        <method>salesOrderPaymentPlaceEnd</method>
                     </phoenix_cashondelivery>
                 </observers>
             </sales_order_payment_place_end>
@@ -137,10 +137,19 @@
                     <phoenix_cashondelivery>
                         <type>singleton</type>
                         <class>phoenix_cashondelivery/observer</class>
-                        <method>order_cancel_after</method>
+                        <method>orderCancelAfter</method>
                     </phoenix_cashondelivery>
                 </observers>
             </order_cancel_after>
+            <sales_order_place_after>
+                <observers>
+                    <phoenix_cashondelivery>
+                        <type>singleton</type>
+                        <class>phoenix_cashondelivery/observer</class>
+                        <method>invoiceCashOnDelivery</method>
+                    </phoenix_cashondelivery>
+                </observers>
+            </sales_order_place_after>
         </events>
         <pdf>
             <totals>
@@ -164,10 +173,10 @@
         </sales>
         <payment>
             <phoenix_cashondelivery>
-                <active>0</active>
+                <title>Cash on Delivery</title>
+                <enable>0</enable>
                 <model>phoenix_cashondelivery/cashOnDelivery</model>
                 <order_status>1</order_status>
-                <title>Cash on Delivery</title>
                 <allowspecific>0</allowspecific>
                 <shippingallowspecific>0</shippingallowspecific>
                 <disallowspecificshippingmethods>0</disallowspecificshippingmethods>
diff --git a/app/code/community/Phoenix/CashOnDelivery/etc/system.xml b/app/code/community/Phoenix/CashOnDelivery/etc/system.xml
index 4cb306a..d6ab2c8 100644
--- a/app/code/community/Phoenix/CashOnDelivery/etc/system.xml
+++ b/app/code/community/Phoenix/CashOnDelivery/etc/system.xml
@@ -48,7 +48,7 @@
                     <show_in_website>1</show_in_website>
                     <show_in_store>1</show_in_store>
                     <fields>
-                        <active translate="label">
+                        <enable translate="label">
                             <label>Enabled</label>
                             <frontend_type>select</frontend_type>
                             <source_model>adminhtml/system_config_source_yesno</source_model>
@@ -56,7 +56,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
-                        </active>
+                        </enable>
                         <display_zero_fee translate="label">
                             <label>Display Zero Fee</label>
                             <frontend_type>select</frontend_type>
@@ -65,6 +65,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </display_zero_fee>
                         <title translate="label">
                             <label>Title</label>
@@ -73,35 +74,39 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </title>
                         <order_status translate="label">
-                            <label>New order status</label>
+                            <label>New Order Status</label>
                             <frontend_type>select</frontend_type>
                             <source_model>adminhtml/system_config_source_order_status</source_model>
                             <sort_order>40</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </order_status>
                         <sort_order translate="label">
-                            <label>Sort order</label>
+                            <label>Sort Order</label>
                             <frontend_type>text</frontend_type>
                             <sort_order>50</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </sort_order>
                         <shippingallowspecific translate="label">
-                            <label>Shipment to applicable countries</label>
+                            <label>Ship to Applicable Countries</label>
                             <frontend_type>allowspecific</frontend_type>
                             <sort_order>60</sort_order>
                             <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </shippingallowspecific>
                         <shippingspecificcountry translate="label">
-                            <label>Shipment to Specific countries</label>
+                            <label>Ship to Specific Countries</label>
                             <frontend_type>multiselect</frontend_type>
                             <sort_order>70</sort_order>
                             <source_model>adminhtml/system_config_source_country</source_model>
@@ -109,6 +114,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <depends>
+                                <enable>1</enable>
                                 <shippingallowspecific>1</shippingallowspecific>
                             </depends>
                         </shippingspecificcountry>
@@ -119,6 +125,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </min_order_total>
                         <max_order_total translate="label">
                             <label>Maximum Order Total</label>
@@ -127,6 +134,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </max_order_total>
                         <cost_type translate="label">
                             <label>Cost calculation</label>
@@ -136,6 +144,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </cost_type>
                         <inlandcosts translate="label">
                             <label>Costs for inland shipping</label>
@@ -144,6 +153,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </inlandcosts>
                         <minimum_inlandcosts translate="label">
                             <label>Costs for inland shipping (minimum)</label>
@@ -153,6 +163,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <depends>
+                                <enable>1</enable>
                                 <cost_type>1</cost_type>
                             </depends>
                         </minimum_inlandcosts>
@@ -163,6 +174,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </foreigncountrycosts>
                         <minimum_foreigncountrycosts translate="label">
                             <label>Costs for shipping to foreign countries (minimum)</label>
@@ -172,6 +184,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <depends>
+                                <enable>1</enable>
                                 <cost_type>1</cost_type>
                             </depends>
                         </minimum_foreigncountrycosts>
@@ -182,6 +195,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </customtext>
                         <disallowspecificshippingmethods translate="label">
                             <label>Disallow specific shipping methods</label>
@@ -191,6 +205,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <depends><enable>1</enable></depends>
                         </disallowspecificshippingmethods>
                         <disallowedshippingmethods translate="label">
                             <label>Disallowed shipping methods</label>
@@ -201,6 +216,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <depends>
+                                <enable>1</enable>
                                 <disallowspecificshippingmethods>1</disallowspecificshippingmethods>
                             </depends>
                         </disallowedshippingmethods>                        
diff --git a/app/code/community/Phoenix/CashOnDelivery/etc/wsdl.xml b/app/code/community/Phoenix/CashOnDelivery/etc/wsdl.xml
new file mode 100644
index 0000000..169025c
--- /dev/null
+++ b/app/code/community/Phoenix/CashOnDelivery/etc/wsdl.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns:typens="urn:{{var wsdl.name}}" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/"
+             name="{{var wsdl.name}}" targetNamespace="urn:{{var wsdl.name}}">
+    <types>
+        <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:Magento">
+            <import namespace="http://schemas.xmlsoap.org/soap/encoding/"
+                    schemaLocation="http://schemas.xmlsoap.org/soap/encoding/"/>
+            <complexType name="salesOrderEntity">
+                <all>
+                    <element name="cod_fee" type="xsd:string" minOccurs="0"/>
+                    <element name="base_cod_fee" type="xsd:string" minOccurs="0"/>
+                </all>
+            </complexType>
+        </schema>
+    </types>
+</definitions>
\ No newline at end of file
diff --git a/app/code/community/Phoenix/CashOnDelivery/etc/wsi.xml b/app/code/community/Phoenix/CashOnDelivery/etc/wsi.xml
new file mode 100644
index 0000000..c9f9a4e
--- /dev/null
+++ b/app/code/community/Phoenix/CashOnDelivery/etc/wsi.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:typens="urn:{{var wsdl.name}}"
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+                  xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+                  name="{{var wsdl.name}}"
+                  targetNamespace="urn:{{var wsdl.name}}">
+    <wsdl:types>
+        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:{{var wsdl.name}}">
+            <xsd:complexType name="salesOrderEntity">
+                <xsd:sequence>
+                    <xsd:element name="cod_fee" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_cod_fee" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+        </xsd:schema>
+    </wsdl:types>
+</wsdl:definitions>
\ No newline at end of file
diff --git a/app/locale/de_DE/Phoenix_CashOnDelivery.csv b/app/locale/de_DE/Phoenix_CashOnDelivery.csv
index 9cff86e..cf66c7c 100644
--- a/app/locale/de_DE/Phoenix_CashOnDelivery.csv
+++ b/app/locale/de_DE/Phoenix_CashOnDelivery.csv
@@ -1,18 +1,23 @@
 "Costs for inland shipping","Kosten für Inlandversand"
+"Costs for inland shipping (minimum)","Kosten für Inlandversand (Minimum)"
 "Costs for shipping to foreign countries","Kosten für Auslandsversand"
+"Costs for shipping to foreign countries (minimum)","Kosten für Auslandsversand (Minimum)"
 "Custom text for checkout page","Benutzerdefinierter Text"
 "Cash on Delivery","Nachnahme"
-"Cash on Delivery fee","Nachnahmegebühr"
+"Cash on Delivery fee","Nachnahme Gebühr"
 "You will be charged an extra fee of %s.","Eine Nachnahmegebühr von %s wird erhoben."
 "Incl. Tax","inkl. Steuern"
-"Cash on Delivery fee (Excl.Tax)","Nachnahmegebühr (exkl. Steuern)"
-"Cash on Delivery fee (Incl.Tax)","Nachnahmegebühr (inkl. Steuern)"
-"Cash on Delivery fee %s","Nachnahmegebühr %s"
-"Refund Cash on Delivery fee","Refund Cash on Delivery fee"
+"Cash on Delivery fee (Excl.Tax)","Nachnahme Gebühr (exkl. Steuern)"
+"Cash on Delivery fee (Incl.Tax)","Nachnahme Gebühr (inkl. Steuern)"
+"Cash on Delivery fee %s","Nachnahme Gebühr %s"
+"Display Zero Fee","Nulltarif anzeigen"
 "Cost calculation","Berechnungsart der Gebühr"
 "Fixed","Fix"
 "Percentage","Prozentual"
 "Cost calculation base","Berechnungsbasis der Gebühr"
-"Please enter an sales_flat_quote_address attribute code which will be taken as base for the cost calculation.","bitte geben Sie hier ein sales_flat_quote_address Attribut Code ein, dessen Wert als Basis für die prozentuale Berechnung benutzt wird."
+"Please enter an sales_flat_quote_address attribute code which will be taken as base for the cost calculation.","Bitte geben Sie hier ein Schlüssel&shy;merkmal sales_flat_quote_address ein, dessen Wert als Basis für die prozentuale Kosten&shy;rechnung genommen wird."
 "Refund Cash on Delivery fee","Nachnahmegebühr erstatten"
-"Cash on Delivery Tax","Cash on Delivery Steuer"
+"Disallow specific shipping methods","Bestimmte Versandmethoden ausschließen"
+"Disallowed shipping methods","Ausgeschlossene Versandmethoden"
+"Invoice Order","Automatische Rechnungs&shy;erstellung"
+"Cash on Delivery Tax","Nachnahme Steuer"
\ No newline at end of file
diff --git a/app/locale/en_GB/Phoenix_CashOnDelivery.csv b/app/locale/en_GB/Phoenix_CashOnDelivery.csv
new file mode 100644
index 0000000..45f05a5
--- /dev/null
+++ b/app/locale/en_GB/Phoenix_CashOnDelivery.csv
@@ -0,0 +1,7 @@
+"Costs for inland shipping","Costs for inland delivery"
+"Costs for inland shipping (minimum)","Costs for inland delivery (minimum)"
+"Costs for shipping to foreign countries","Costs for delivery to foreign countries"
+"Costs for shipping to foreign countries (minimum)","Costs for delivery to foreign countries (minimum)"
+"Incl. Tax","Incl. VAT"
+"Cash on Delivery fee (Excl.Tax)","Cash on Delivery fee (Excl.VAT)"
+"Cash on Delivery fee (Incl.Tax)","Cash on Delivery fee (Incl.VAT)"
diff --git a/app/locale/en_US/Phoenix_CashOnDelivery.csv b/app/locale/en_US/Phoenix_CashOnDelivery.csv
index 2a56d8c..556c0e9 100644
--- a/app/locale/en_US/Phoenix_CashOnDelivery.csv
+++ b/app/locale/en_US/Phoenix_CashOnDelivery.csv
@@ -10,11 +10,14 @@
 "Cash on Delivery fee (Excl.Tax)","Cash on Delivery fee (Excl.Tax)"
 "Cash on Delivery fee (Incl.Tax)","Cash on Delivery fee (Incl.Tax)"
 "Cash on Delivery fee %s","Cash on Delivery fee %s"
-"Refund Cash on Delivery fee","Refund Cash on Delivery fee"
+"Display Zero Fee","Display Zero Fee"
 "Cost calculation","Cost calculation"
 "Fixed","Fixed"
 "Percentage","Percentage"
 "Cost calculation base","Cost calculation base"
 "Please enter an sales_flat_quote_address attribute code which will be taken as base for the cost calculation.","Please enter an sales_flat_quote_address attribute code which will be taken as base for the cost calculation."
 "Refund Cash on Delivery fee","Refund Cash on Delivery fee"
-"Cash on Delivery Tax","Cash on Delivery Tax"
+"Disallow specific shipping methods","Disallow specific shipping methods"
+"Disallowed shipping methods","Disallowed shipping methods"
+"Invoice Order","Automatically create an invoice"
+"Cash on Delivery Tax","Cash on Delivery Tax"
\ No newline at end of file
diff --git a/app/locale/es_ES/Phoenix_CashOnDelivery.csv b/app/locale/es_ES/Phoenix_CashOnDelivery.csv
index ed76a81..8cac7b9 100644
--- a/app/locale/es_ES/Phoenix_CashOnDelivery.csv
+++ b/app/locale/es_ES/Phoenix_CashOnDelivery.csv
@@ -3,17 +3,21 @@
 "Costs for shipping to foreign countries","Coste para envío internacional"
 "Costs for shipping to foreign countries (minimum)","Coste para envío internacional (mínimo)"
 "Custom text for checkout page","Texto personalizado para el carrito"
-"Cash on Delivery","Contrareembolso"
+"Cash on Delivery","Envío Contra Reembolso (C.O.D.)"
 "Cash on Delivery fee","Recargo por contrareembolso"
-"You will be charged an extra fee of %s.","Se te cargará un extra de %s."
+"You will be charged an extra fee of %s.","Se le cargará un importe extra de %s."
 "Incl. Tax","Impuestos incluidos"
-"Cash on Delivery fee (Excl.Tax)","Contrareembolso (impuestos excluidos)"
-"Cash on Delivery fee (Incl.Tax)","Contrareembolso (impuestos incluidos)"
-"Cash on Delivery fee %s","Contrareembolso %s"
-"Refund Cash on Delivery fee","Reintegro de recargo por contrareembolso"
+"Cash on Delivery fee (Excl.Tax)","Recargo por contrareembolso (impuestos excluidos)"
+"Cash on Delivery fee (Incl.Tax)","Recargo por contrareembolso (impuestos incluidos)"
+"Cash on Delivery fee %s","Recargo por contrareembolso %s"
+"Display Zero Fee","Mostrar cuota cero"
 "Cost calculation","Cálculo del coste"
 "Fixed","Fijo"
 "Percentage","Porcentaje"
 "Cost calculation base","Base para el cálculo"
-"Please enter an sales_flat_quote_address attribute code which will be taken as base for the cost calculation.","Por favor, introduce el nombre de un campo del modelo sales_flat_quote_address que se usará como base para el cálculo."
+"Please enter an sales_flat_quote_address attribute code which will be taken as base for the cost calculation.","Por favor, introduzca un código de atributo sales_flat_quote_address cuyo valor se toma como base para calcular los costes."
 "Refund Cash on Delivery fee","Reintegro de recargo por contrareembolso"
+"Disallow specific shipping methods","Excluir métodos de entrega específicos"
+"Disallowed shipping methods","Métodos de entrega excludidos"
+"Invoice Order","Creación automática de la factura"
+"Cash on Delivery Tax","Impuesto por contrareembolso"
\ No newline at end of file
diff --git a/app/locale/fr_FR/Phoenix_CashOnDelivery.csv b/app/locale/fr_FR/Phoenix_CashOnDelivery.csv
new file mode 100644
index 0000000..913fdd5
--- /dev/null
+++ b/app/locale/fr_FR/Phoenix_CashOnDelivery.csv
@@ -0,0 +1,23 @@
+"Costs for inland shipping","Coûts de transport intérieure"
+"Costs for inland shipping (minimum)","Coûts de transport intérieure (minimum)"
+"Costs for shipping to foreign countries","Coûts d'expédition vers les pays étrangers"
+"Costs for shipping to foreign countries (minimum)","Coûts d'expédition vers les pays étrangers (minimum)"
+"Custom text for checkout page","Texte personnalisé pour la page de paiement"
+"Cash on Delivery","Paiement à la livraison (C.O.D.)"
+"Cash on Delivery fee","Frais pour paiement à la livraison"
+"You will be charged an extra fee of %s.","Vous serez facturé des frais supplémentaires de %s."
+"Incl. Tax","Taxes incluses"
+"Cash on Delivery fee (Excl.Tax)","Frais pour paiement à la livraison (taxes en sus)"
+"Cash on Delivery fee (Incl.Tax)","Frais pour paiement à la livraison (taxes incluses)"
+"Cash on Delivery fee %s","Frais pour paiement à la livraison %s"
+"Display Zero Fee","Afficher les frais zéro"
+"Cost calculation","Calcul des coûts"
+"Fixed","Fixé"
+"Percentage","Pourcentage"
+"Cost calculation base","Base de calcul des coûts"
+"Please enter an sales_flat_quote_address attribute code which will be taken as base for the cost calculation.","Veuillez entrer un code d'attribut sales_flat_quote_address dont la valeur est utilisée comme base pour le calcul du coût."
+"Refund Cash on Delivery fee","Remboursement des frais de livraison"
+"Disallow specific shipping methods","Exclure les méthodes d'expédition spécifiques"
+"Disallowed shipping methods","Méthodes d'expédition non autorisées"
+"Invoice Order","Facturation automatique"
+"Cash on Delivery Tax","Taxe pour paiement à la livraison"
\ No newline at end of file
diff --git a/app/locale/it_IT/Phoenix_CashOnDelivery.csv b/app/locale/it_IT/Phoenix_CashOnDelivery.csv
index 6e6f41a..79b6d9e 100644
--- a/app/locale/it_IT/Phoenix_CashOnDelivery.csv
+++ b/app/locale/it_IT/Phoenix_CashOnDelivery.csv
@@ -3,17 +3,21 @@
 "Costs for shipping to foreign countries","Costi per la spedizione fuori dal territorio nazionale"
 "Costs for shipping to foreign countries (minimum)","Costi per la spedizione fuori dal territorio nazionale (minimo)"
 "Custom text for checkout page","Testo personalizzato per la pagina di checkout"
-"Cash on Delivery","Contrassegno alla consegna"
-"Cash on Delivery fee","Costo del Contrassegno alla consegna"
+"Cash on Delivery","Pagamento in contrassegno"
+"Cash on Delivery fee","Tariffa contrassegno"
 "You will be charged an extra fee of %s.","Verrà addebitato un costo aggiuntivo di %s."
 "Incl. Tax","Incl. Tasse"
-"Cash on Delivery fee (Excl.Tax)","Costo del Contrassegno (Escluse Tasse)"
-"Cash on Delivery fee (Incl.Tax)","Costo del Contrassegno (Incluse Tasse)"
-"Cash on Delivery fee %s","Costo Contrassegno %s"
-"Refund Cash on Delivery fee","Rimborso del costo del contrassegno"
-"Cost calculation","Calcolo costo"
+"Cash on Delivery fee (Excl.Tax)","Tariffa contrassegno (Escl.Tasse))"
+"Cash on Delivery fee (Incl.Tax)","Tariffa contrassegno (Incl.Tasse)"
+"Cash on Delivery fee %s","Tariffa contrassegno %s"
+"Display Zero Fee","Mostra quota zero"
+"Cost calculation","Calcolo dei costi"
 "Fixed","Fisso"
 "Percentage","Percentuale"
-"Cost calculation base","Calcolo del costo di base"
-"Please enter an sales_flat_quote_address attribute code which will be taken as base for the cost calculation.","Inserire un attributo con il codice sales_flat_quote_address il quale verrà usato come base per il calcolo dei costi"
-"Refund Cash on Delivery fee","Rimborsa il costo del contrassegno"
\ No newline at end of file
+"Cost calculation base","Base calcolo dei costi"
+"Please enter an sales_flat_quote_address attribute code which will be taken as base for the cost calculation.","Per favore inserire un codice attributo della sales_flat_quote_address che verrà usato come base per il calcolo dei costi."
+"Refund Cash on Delivery fee","Rimborso tariffa contrassegno"
+"Disallow specific shipping methods","Escludere metodi di consegna specifici"
+"Disallowed shipping methods","Modalità di consegna excludidos"
+"Invoice Order","Creazione automatica di fattura"
+"Cash on Delivery Tax","Imposta contrassegno"
\ No newline at end of file
diff --git a/app/locale/pt_PT/Phoenix_CashOnDelivery.csv b/app/locale/pt_PT/Phoenix_CashOnDelivery.csv
new file mode 100644
index 0000000..ce75e3c
--- /dev/null
+++ b/app/locale/pt_PT/Phoenix_CashOnDelivery.csv
@@ -0,0 +1,23 @@
+"Costs for inland shipping","Custo de transporte doméstico"
+"Costs for inland shipping (minimum)","Custo de transporte doméstico (mínimo)"
+"Costs for shipping to foreign countries","Custo de transporte internacional"
+"Costs for shipping to foreign countries (minimum)","Custo de transporte internacional (mínimo)"
+"Custom text for checkout page","Texto personalizado para o carrinho"
+"Cash on Delivery","Dinheiro na entrega"
+"Cash on Delivery fee","Taxa de dinheiro na entrega"
+"Cash on Delivery fee (Excl.Tax)","Taxa de dinheiro na entrega (excluindo IVA)"
+"Cash on Delivery fee (Incl.Tax)","Taxa de dinheiro na entrega (imposto incluído)"
+"Cash on Delivery fee %s","Taxa de dinheiro na entrega %s"
+"Cost calculation","Cálculo de custo"
+"Cost calculation base","Base de cálculo de custos"
+"Display Zero Fee","Mostrar taxa de zero"
+"Fixed","Fixo"
+"Incl. Tax","Impostos incluídos"
+"Percentage","Percentagem"
+"Please enter an sales_flat_quote_address attribute code which will be taken as base for the cost calculation.","Por favor, introduza o código de atributo sales_flat_quote_address cujo valor é tomado como base para o cálculo dos custos."
+"Refund Cash on Delivery fee","Reembolso em dinheiro na taxa de entrega"
+"You will be charged an extra fee of %s.","Será cobrada uma taxa extra de %s."
+"Disallow specific shipping methods","Não permite métodos específicos de envio"
+"Disallowed shipping methods","Métodos de transporte não permitidos"
+"Invoice Order","Criação de fatura automática"
+"Cash on Delivery Tax","Imposto de dinheiro na entrega"
\ No newline at end of file
diff --git a/modman b/modman
index 54fa47b..9141ee4 100644
--- a/modman
+++ b/modman
@@ -1,11 +1,12 @@
-app/code/community/Phoenix/CashOnDelivery/* app/code/community/Phoenix/CashOnDelivery/
-app/design/adminhtml/default/default/layout/phoenix/* app/design/adminhtml/default/default/layout/phoenix/
-app/design/adminhtml/default/default/template/phoenix/cashondelivery/* app/design/adminhtml/default/default/template/phoenix/cashondelivery/
-app/design/frontend/base/default/layout/phoenix/* app/design/frontend/base/default/layout/phoenix/
-app/design/frontend/base/default/template/phoenix/cashondelivery/* app/design/frontend/base/default/template/phoenix/cashondelivery/
+app/code/community/Phoenix/CashOnDelivery app/code/community/Phoenix/CashOnDelivery
+app/design/adminhtml/default/default/layout/phoenix app/design/adminhtml/default/default/layout/phoenix
+app/design/adminhtml/default/default/template/phoenix/cashondelivery app/design/adminhtml/default/default/template/phoenix/cashondelivery
+app/design/frontend/base/default/layout/phoenix app/design/frontend/base/default/layout/phoenix
+app/design/frontend/base/default/template/phoenix/cashondelivery app/design/frontend/base/default/template/phoenix/cashondelivery
 app/etc/modules/Phoenix_CashOnDelivery.xml app/etc/modules/Phoenix_CashOnDelivery.xml
 app/locale/de_DE/Phoenix_CashOnDelivery.csv app/locale/de_DE/Phoenix_CashOnDelivery.csv
 app/locale/el_GR/Phoenix_CashOnDelivery.csv app/locale/el_GR/Phoenix_CashOnDelivery.csv
 app/locale/en_US/Phoenix_CashOnDelivery.csv app/locale/en_US/Phoenix_CashOnDelivery.csv
+app/locale/fr_FR/Phoenix_CashOnDelivery.csv app/locale/fr_FR/Phoenix_CashOnDelivery.csv
 app/locale/pl_PL/Phoenix_CashOnDelivery.csv app/locale/pl_PL/Phoenix_CashOnDelivery.csv
-js/phoenix/cashondelivery/* js/phoenix/cashondelivery/
\ No newline at end of file
+js/phoenix/cashondelivery js/phoenix/cashondelivery
\ No newline at end of file
diff --git a/var/connect/Phoenix_CashOnDelivery.xml b/var/connect/Phoenix_CashOnDelivery.xml
new file mode 100644
index 0000000..4de14a6
--- /dev/null
+++ b/var/connect/Phoenix_CashOnDelivery.xml
@@ -0,0 +1,162 @@
+<_>
+   <form_key></form_key>
+   <name>Phoenix_CashOnDelivery</name>
+   <channel>community</channel>
+   <version_ids>
+      <version_ids>2</version_ids>
+   </version_ids>
+   <summary>Nachnahme - Cash on Delivery allows to book additional fee on delivery depending on national or international delivery. (MWS)</summary>
+   <description>Cash on Delivery allows to book additional fee on delivery depending on national or international delivery.</description>
+   <license>OSL</license>
+   <license_uri>http://opensource.org/licenses/osl-3.0.php</license_uri>
+   <version>1.0.14</version>
+   <stability>stable</stability>
+   <notes>ase Cash on Delivery fee calculation on subtotal including tax
+CoD refund now changeable
+Missing CoD tax in invoice/creditmemo tax subtotal</notes>
+   <authors>
+      <name>
+         <name>Phoenix Media GmbH</name>
+      </name>
+      <user>
+         <user>PHOENIX</user>
+      </user>
+      <email>
+         <email>support@at.phoenix-media.eu</email>
+      </email>
+   </authors>
+   <depends_php_min>5.2.0</depends_php_min>
+   <depends_php_max>7.0.27</depends_php_max>
+   <depends>
+      <package>
+         <name>
+            <name/>
+         </name>
+         <channel>
+            <channel/>
+         </channel>
+         <min>
+            <min/>
+         </min>
+         <max>
+            <max/>
+         </max>
+         <files>
+            <files/>
+         </files>
+      </package>
+      <extension>
+         <name>
+            <name>Core</name>
+         </name>
+         <min>
+            <min/>
+         </min>
+         <max>
+            <max/>
+         </max>
+      </extension>
+   </depends>
+   <contents>
+      <target>
+         <target>magelocal</target>
+         <target>magecommunity</target>
+         <target>mageetc</target>
+         <target>magelocale</target>
+         <target>magelocale</target>
+         <target>magelocale</target>
+         <target>magelocale</target>
+         <target>magelocale</target>
+         <target>magelocale</target>
+         <target>magelocale</target>
+         <target>magelocale</target>
+         <target>magelocale</target>
+         <target>magelocale</target>
+         <target>magedesign</target>
+         <target>magedesign</target>
+         <target>magedesign</target>
+         <target>magedesign</target>
+         <target>mage</target>
+      </target>
+      <path>
+         <path/>
+         <path>Phoenix/CashOnDelivery</path>
+         <path>modules/Phoenix_CashOnDelivery.xml</path>
+         <path>de_DE/Phoenix_CashOnDelivery.csv</path>
+         <path>el_GR/Phoenix_CashOnDelivery.csv</path>
+         <path>en_US/Phoenix_CashOnDelivery.csv</path>
+         <path>en_GB/Phoenix_CashOnDelivery.csv</path>
+         <path>es_ES/Phoenix_CashOnDelivery.csv</path>
+         <path>fr_FR/Phoenix_CashOnDelivery.csv</path>
+         <path>it_IT/Phoenix_CashOnDelivery.csv</path>
+         <path>nb_NO/Phoenix_CashOnDelivery.csv</path>
+         <path>pl_PL/Phoenix_CashOnDelivery.csv</path>
+         <path>pt_PT/Phoenix_CashOnDelivery.csv</path>
+         <path>adminhtml/default/default/layout/phoenix/cashondelivery.xml</path>
+         <path>adminhtml/default/default/template/phoenix/cashondelivery</path>
+         <path>frontend/base/default/layout/phoenix/cashondelivery.xml</path>
+         <path>frontend/base/default/template/phoenix/cashondelivery</path>
+         <path>js/phoenix/cashondelivery/sales.js</path>
+      </path>
+      <type>
+         <type>file</type>
+         <type>dir</type>
+         <type>file</type>
+         <type>file</type>
+         <type>file</type>
+         <type>file</type>
+         <type>file</type>
+         <type>file</type>
+         <type>file</type>
+         <type>file</type>
+         <type>file</type>
+         <type>file</type>
+         <type>file</type>
+         <type>file</type>
+         <type>dir</type>
+         <type>file</type>
+         <type>dir</type>
+         <type>file</type>
+      </type>
+      <include>
+         <include/>
+         <include/>
+         <include/>
+         <include/>
+         <include/>
+         <include/>
+         <include/>
+         <include/>
+         <include/>
+         <include/>
+         <include/>
+         <include/>
+         <include/>
+         <include/>
+         <include/>
+         <include/>
+         <include/>
+         <include/>
+      </include>
+      <ignore>
+         <ignore/>
+         <ignore>#^.DS_Store#</ignore>
+         <ignore>#^.DS_Store#</ignore>
+         <ignore>#^.DS_Store#</ignore>
+         <ignore>#^.DS_Store#</ignore>
+         <ignore>#^.DS_Store#</ignore>
+         <ignore>#^.DS_Store#</ignore>
+         <ignore>#^.DS_Store#</ignore>
+         <ignore>#^.DS_Store#</ignore>
+         <ignore>#^.DS_Store#</ignore>
+         <ignore>#^.DS_Store#</ignore>
+         <ignore>#^.DS_Store#</ignore>
+         <ignore>#^.DS_Store#</ignore>
+         <ignore>#^.DS_Store#</ignore>
+         <ignore>#^.DS_Store#</ignore>
+         <ignore>#^.DS_Store#</ignore>
+         <ignore>#^.DS_Store#</ignore>
+         <ignore>#^.DS_Store#</ignore>
+      </ignore>
+   </contents>
+</_>