diff --git a/zipcode.module b/zipcode.module
index 73604b0..005c2c4 100644
--- a/zipcode.module
+++ b/zipcode.module
@@ -33,7 +33,7 @@ function zipcode_field_info() {
     'gp_zipcode' => array('label' => t('Zipcode - Guadeloupe')),
     'cl_zipcode' => array('label' => t('Zipcode - Chile')),
     'ar_zipcode' => array('label' => t('Zipcode - Argentina')),
-    'br_zipcode' => array('label' => t('Zipcode - Brazil')),    
+    'br_zipcode' => array('label' => t('Zipcode - Brazil')),
     'uk_zipcode' => array('label' => t('Zipcode - United Kingdom')),
     'be_zipcode' => array('label' => t('Zipcode - Belgium')),
     'nl_zipcode' => array('label' => t('Zipcode - Netherlanc')),
@@ -46,10 +46,10 @@ function zipcode_field_info() {
     'hr_zipcode' => array('label' => t('Zipcode - Croatia')),
     'by_zipcode' => array('label' => t('Zipcode - Belarussia')),
     'ru_zipcode' => array('label' => t('Zipcode - Russia')),
-    'cn_zipcode' => array('label' => t('Zipcode - China')),    
+    'cn_zipcode' => array('label' => t('Zipcode - China')),
     'jp_zipcode' => array('label' => t('Zipcode - Japan')),
     'au_zipcode' => array('label' => t('Zipcode - Australia')),
-    'nz_zipcode' => array('label' => t('Zipcode - New Zealand')),    
+    'nz_zipcode' => array('label' => t('Zipcode - New Zealand')),
     'dk_zipcode' => array('label' => t('Zipcode - Daenmark')),
     'se_zipcode' => array('label' => t('Zipcode - Sweden')),
     'pt_zipcode' => array('label' => t('Zipcode - Portugal')),
@@ -152,7 +152,7 @@ function zipcode_field_settings($op, $field) {
          $columns = array(
                  'value' => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE),
           );
-      }      
+      }
       if ($field['type'] == 'uk_zipcode') {
          $columns = array(
             	'value' => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE),
@@ -217,12 +217,12 @@ function zipcode_field_settings($op, $field) {
       	$columns = array(
         	'value' => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE),
       	);
-      }      
+      }
       if ($field['type'] == 'jp_zipcode') {
       	$columns = array(
         	'value' => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE),
       	);
-      }      
+      }
       if ($field['type'] == 'au_zipcode') {
       	$columns = array(
         	'value' => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE),
@@ -232,7 +232,7 @@ function zipcode_field_settings($op, $field) {
       	$columns = array(
         	'value' => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE),
       	);
-      }      
+      }
       if ($field['type'] == 'dk_zipcode') {
       	$columns = array(
         	'value' => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE),
@@ -346,9 +346,9 @@ function zipcode_field($op, &$node, $field, &$node_field, $teaser, $page) {
           }
           if ($field['type'] == 'br_zipcode' && !valid_zipcode('br', $item['value'])) {
             form_set_error($field['field_name'], t('"%value" is not a valid Brazilian zipcode.<br>Zipcodes should ...',array('%value' => $item['value'])));
-          }           
+          }
           if ($field['type'] == 'uk_zipcode' && !valid_zipcode('uk', $item['value'])) {
-            form_set_error($field['field_name'], t('"%value" is not a valid United Kingom postal code.<br>Postal codes should be like AB1 C23 or AB1C23 ...',array('%value' => $item['value'])));
+            form_set_error($field['field_name'], t('"%value" is not a valid United Kingom postal code.<br>Postal codes should be like 9A 9AA or A9A 9AA ...',array('%value' => $item['value'])));
           }
           if ($field['type'] == 'be_zipcode' && !valid_zipcode('be', $item['value'])) {
 	    form_set_error($field['field_name'], t('"%value" is not a valid Belgian zipcode.<br>Zipcodes should ...',array('%value' => $item['value'])));
@@ -385,16 +385,16 @@ function zipcode_field($op, &$node, $field, &$node_field, $teaser, $page) {
           }
           if ($field['type'] == 'cn_zipcode' && !valid_zipcode('cn', $item['value'])) {
 	    form_set_error($field['field_name'], t('"%value" is not a valid Chinese zipcode.<br>Zipcodes should contain ...',array('%value' => $item['value'])));
-          }          
+          }
           if ($field['type'] == 'jp_zipcode' && !valid_zipcode('jp', $item['value'])) {
 	    form_set_error($field['field_name'], t('"%value" is not a valid Japanese zipcode.<br>Zipcodes should contain ...',array('%value' => $item['value'])));
-          }          
+          }
           if ($field['type'] == 'au_zipcode' && !valid_zipcode('au', $item['value'])) {
 	    form_set_error($field['field_name'], t('"%value" is not a valid Australian zipcode.<br>Zipcodes should contain 4 numbers',array('%value' => $item['value'])));
           }
           if ($field['type'] == 'nz_zipcode' && !valid_zipcode('nz', $item['value'])) {
 	    form_set_error($field['field_name'], t('"%value" is not a valid New Zealand zipcode.<br>Zipcodes should contain 4 numbers',array('%value' => $item['value'])));
-          }          
+          }
           if ($field['type'] == 'dk_zipcode' && !valid_zipcode('dk', $item['value'])) {
 	    form_set_error($field['field_name'], t('"%value" is not a valid Danish zipcode.<br>Zipcodes should contain 4 numbers',array('%value' => $item['value'])));
           }
@@ -450,10 +450,10 @@ function zipcode_field($op, &$node, $field, &$node_field, $teaser, $page) {
           }
           if ($field['type'] == 'ar_zipcode') {
             $node_field[$delta]['value'] = format_zipcode('ar', $node_field[$delta]['value'], $field);
-          }  
+          }
           if ($field['type'] == 'br_zipcode') {
             $node_field[$delta]['value'] = format_zipcode('br', $node_field[$delta]['value'], $field);
-          }          
+          }
           if ($field['type'] == 'uk_zipcode') {
             $node_field[$delta]['value'] = format_zipcode('uk', $node_field[$delta]['value'], $field);
           }
@@ -492,16 +492,16 @@ function zipcode_field($op, &$node, $field, &$node_field, $teaser, $page) {
           }
           if ($field['type'] == 'cn_zipcode') {
             $node_field[$delta]['value'] = format_zipcode('cn', $node_field[$delta]['value'], $field);
-          }          
+          }
           if ($field['type'] == 'jp_zipcode') {
             $node_field[$delta]['value'] = format_zipcode('jp', $node_field[$delta]['value'], $field);
-          }          
+          }
           if ($field['type'] == 'au_zipcode') {
             $node_field[$delta]['value'] = format_zipcode('au', $node_field[$delta]['value'], $field);
           }
           if ($field['type'] == 'nz_zipcode') {
             $node_field[$delta]['value'] = format_zipcode('nz', $node_field[$delta]['value'], $field);
-          }          
+          }
           if ($field['type'] == 'dk_zipcode') {
             $node_field[$delta]['value'] = format_zipcode('dk', $node_field[$delta]['value'], $field);
           }
@@ -642,10 +642,10 @@ function zipcode_field_formatter_info() {
       			'hr_zipcode',
       			'by_zipcode',
       			'ru_zipcode',
-      			'cn_zipcode',      			
-      			'jp_zipcode',      			
+      			'cn_zipcode',
+      			'jp_zipcode',
       			'au_zipcode',
-      			'nz_zipcode',      			
+      			'nz_zipcode',
       			'dk_zipcode',
       			'se_zipcode',
       			'pt_zipcode',
@@ -738,10 +738,10 @@ function zipcode_widget_info() {
       			'hr_zipcode',
       			'by_zipcode',
       			'ru_zipcode',
-      			'cn_zipcode',      			
-      			'jp_zipcode',      			
+      			'cn_zipcode',
+      			'jp_zipcode',
       			'au_zipcode',
-      			'nz_zipcode',      			
+      			'nz_zipcode',
       			'dk_zipcode',
       			'se_zipcode',
       			'pt_zipcode',
@@ -910,7 +910,7 @@ function zipcode_textfield_process($element, $edit, $form_state, $form) {
   $element[$field_key] = array(
     '#type' => 'textfield',
     '#default_value' => isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : NULL,
-    '#size' => !empty($field['widget']['size']) ? $field['widget']['size'] : 60,    
+    '#size' => !empty($field['widget']['size']) ? $field['widget']['size'] : 60,
     '#autocomplete_path' => FALSE,
     // The following values were set by the content module and need
     // to be passed down to the nested element.
@@ -961,8 +961,8 @@ function zipcode_supported_countrycode($countrycode) {
   	|| $countrycode == 'us'
   	|| $countrycode == 'gp'
   	|| $countrycode == 'cl'
-  	|| $countrycode == 'ar'  	
-  	|| $countrycode == 'br'  	  	
+  	|| $countrycode == 'ar'
+  	|| $countrycode == 'br'
   	|| $countrycode == 'uk'
   	|| $countrycode == 'be'
   	|| $countrycode == 'nl'
@@ -975,10 +975,10 @@ function zipcode_supported_countrycode($countrycode) {
   	|| $countrycode == 'hr'
   	|| $countrycode == 'by'
   	|| $countrycode == 'ru'
-  	|| $countrycode == 'cn'  	
-  	|| $countrycode == 'jp'  	
+  	|| $countrycode == 'cn'
+  	|| $countrycode == 'jp'
   	|| $countrycode == 'au'
-  	|| $countrycode == 'nz'  	
+  	|| $countrycode == 'nz'
   	|| $countrycode == 'dk'
   	|| $countrycode == 'se'
   	|| $countrycode == 'pt'