diff --git a/base_location/README.rst b/base_location/README.rst
new file mode 100644
index 000000000..817183a5b
--- /dev/null
+++ b/base_location/README.rst
@@ -0,0 +1,20 @@
+Enhanced ZIP management
+=======================
+
+This module introduces a better zip/npa management system.
+
+It enables zip, city, state and country auto-completion on partners and companies.
+
+Also allows different search filters.
+
+
+Author
+------
+
+- Nicolas Bessi. (Copyright Camptocamp SA)
+
+Contributors
+------------
+- Ignacio Ibeas (Acysos S.L.)
+- Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
+- Alejandro Santana <alejandrosantana@anubia.es>
diff --git a/base_location/__openerp__.py b/base_location/__openerp__.py
index 943648ac1..1281ea1c3 100644
--- a/base_location/__openerp__.py
+++ b/base_location/__openerp__.py
@@ -22,12 +22,21 @@
 ##############################################################################
 {
     'name': 'Location management (aka Better ZIP)',
-    'version': '0.3.2',
+    'version': '1.0',
     'depends': ['base'],
     'author': 'Camptocamp',
+    'license': "AGPL-3",
+    'contributors': [
+        'Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>',
+        'Ignacio Ibeas (Acysos S.L.)',
+        'Alejandro Santana <alejandrosantana@anubia.es>',
+    ],
+    'summary': '''Enhanced zip/npa management system''',
     'description': '''
-    Introduces a better zip/npa management system.
-    It enables zip/city auto-completion on partners.''',
+    This module introduces a better zip/npa management system.
+    It enables zip, city, state and country auto-completion on partners and 
+    companies.
+    Also allows different search filters.''',
     'website': 'http://www.camptocamp.com',
     'data': ['views/better_zip.xml',
              'views/state.xml',
diff --git a/base_location/models/partner.py b/base_location/models/partner.py
index 3dc7fe99b..7bb0833d2 100644
--- a/base_location/models/partner.py
+++ b/base_location/models/partner.py
@@ -25,7 +25,7 @@ from openerp import models, fields, api
 
 class ResPartner(models.Model):
     _inherit = 'res.partner'
-    zip_id =  fields.Many2one('res.better.zip', 'City/Location')
+    zip_id = fields.Many2one('res.better.zip', 'City/Location')
 
     @api.multi
     @api.onchange('zip_id')
diff --git a/base_location/views/res_country.xml b/base_location/views/res_country.xml
index 5bdb089a5..a2ed80258 100644
--- a/base_location/views/res_country.xml
+++ b/base_location/views/res_country.xml
@@ -12,25 +12,6 @@
 				</search>
 			</field>
 		</record>
-		
-        <record id="view_country_tree_currency" model="ir.ui.view">
-            <field name="name">res.country.tree</field>
-            <field name="model">res.country</field>
-            <field name="inherit_id" ref="base.view_country_tree"/>
-            <field name="arch" type="xml">
-                <field name="code" position="after">
-                	<field name="currency_id"/>
-                </field>
-            </field>
-        </record>
-
-<!--         <record id="action_country" model="ir.actions.act_window"> -->
-<!--             <field name="name">Countries</field> -->
-<!--             <field name="type">ir.actions.act_window</field> -->
-<!--             <field name="res_model">res.country</field> -->
-<!--             <field name="view_type">form</field> -->
-<!--             <field name="help">Display and manage the list of all countries that can be assigned to your partner records. You can create or delete countries to make sure the ones you are working on will be maintained.</field> -->
-<!--         </record> -->
 
     </data>
 </openerp>