diff --git a/src/Codes.php b/src/Codes.php
index 0aa32fd..a1b973e 100644
--- a/src/Codes.php
+++ b/src/Codes.php
@@ -4,269 +4,270 @@
 class Codes
 {
 	// Thank you 
-	// https://gist.github.com/vxnick/380904
+	// https://gist.github.com/vxnick/380904#gistcomment-1433576
 	
 	public static $countries = array(
-		'AF' => 'Afghanistan',
-		'AX' => 'Aland Islands',
-		'AL' => 'Albania',
-		'DZ' => 'Algeria',
-		'AS' => 'American Samoa',
-		'AD' => 'Andorra',
-		'AO' => 'Angola',
-		'AI' => 'Anguilla',
-		'AQ' => 'Antarctica',
-		'AG' => 'Antigua And Barbuda',
-		'AR' => 'Argentina',
-		'AM' => 'Armenia',
-		'AW' => 'Aruba',
-		'AU' => 'Australia',
-		'AT' => 'Austria',
-		'AZ' => 'Azerbaijan',
-		'BS' => 'Bahamas',
-		'BH' => 'Bahrain',
-		'BD' => 'Bangladesh',
-		'BB' => 'Barbados',
-		'BY' => 'Belarus',
-		'BE' => 'Belgium',
-		'BZ' => 'Belize',
-		'BJ' => 'Benin',
-		'BM' => 'Bermuda',
-		'BT' => 'Bhutan',
-		'BO' => 'Bolivia',
-		'BQ' => 'Bonaire, Sint Eustatius and Saba',
-		'BA' => 'Bosnia And Herzegovina',
-		'BW' => 'Botswana',
-		'BV' => 'Bouvet Island',
-		'BR' => 'Brazil',
-		'IO' => 'British Indian Ocean Territory',
-		'BN' => 'Brunei Darussalam',
-		'BG' => 'Bulgaria',
-		'BF' => 'Burkina Faso',
-		'BI' => 'Burundi',
-		'KH' => 'Cambodia',
-		'CM' => 'Cameroon',
-		'CA' => 'Canada',
-		'CV' => 'Cape Verde',
-		'KY' => 'Cayman Islands',
-		'CF' => 'Central African Republic',
-		'TD' => 'Chad',
-		'CL' => 'Chile',
-		'CN' => 'China',
-		'CX' => 'Christmas Island',
-		'CC' => 'Cocos (Keeling) Islands',
-		'CO' => 'Colombia',
-		'KM' => 'Comoros',
-		'CG' => 'Congo',
-		'CD' => 'Congo, Democratic Republic',
-		'CK' => 'Cook Islands',
-		'CR' => 'Costa Rica',
-		'CI' => 'Cote D\'Ivoire',
-		'HR' => 'Croatia',
-		'CU' => 'Cuba',
-		'CW' => 'Curacao',
-		'CY' => 'Cyprus',
-		'CZ' => 'Czech Republic',
-		'DK' => 'Denmark',
-		'DJ' => 'Djibouti',
-		'DM' => 'Dominica',
-		'DO' => 'Dominican Republic',
-		'EC' => 'Ecuador',
-		'EG' => 'Egypt',
-		'SV' => 'El Salvador',
-		'GQ' => 'Equatorial Guinea',
-		'ER' => 'Eritrea',
-		'EE' => 'Estonia',
-		'ET' => 'Ethiopia',
-		'FK' => 'Falkland Islands (Malvinas)',
-		'FO' => 'Faroe Islands',
-		'FJ' => 'Fiji',
-		'FI' => 'Finland',
-		'FR' => 'France',
-		'GF' => 'French Guiana',
-		'PF' => 'French Polynesia',
-		'TF' => 'French Southern Territories',
-		'GA' => 'Gabon',
-		'GM' => 'Gambia',
-		'GE' => 'Georgia',
-		'DE' => 'Germany',
-		'GH' => 'Ghana',
-		'GI' => 'Gibraltar',
-		'GR' => 'Greece',
-		'GL' => 'Greenland',
-		'GD' => 'Grenada',
-		'GP' => 'Guadeloupe',
-		'GU' => 'Guam',
-		'GT' => 'Guatemala',
-		'GG' => 'Guernsey',
-		'GN' => 'Guinea',
-		'GW' => 'Guinea-Bissau',
-		'GY' => 'Guyana',
-		'HT' => 'Haiti',
-		'HM' => 'Heard Island & Mcdonald Islands',
-		'VA' => 'Holy See (Vatican City State)',
-		'HN' => 'Honduras',
-		'HK' => 'Hong Kong',
-		'HU' => 'Hungary',
-		'IS' => 'Iceland',
-		'IN' => 'India',
-		'ID' => 'Indonesia',
-		'IR' => 'Iran, Islamic Republic Of',
-		'IQ' => 'Iraq',
-		'IE' => 'Ireland',
-		'IM' => 'Isle Of Man',
-		'IL' => 'Israel',
-		'IT' => 'Italy',
-		'JM' => 'Jamaica',
-		'JP' => 'Japan',
-		'JE' => 'Jersey',
-		'JO' => 'Jordan',
-		'KZ' => 'Kazakhstan',
-		'KE' => 'Kenya',
-		'KI' => 'Kiribati',
-		'KP' => 'Korea, Democratic People\'s Republic of',
-		'KR' => 'Korea',
-		'KW' => 'Kuwait',
-		'KG' => 'Kyrgyzstan',
-		'LA' => 'Lao People\'s Democratic Republic',
-		'LV' => 'Latvia',
-		'LB' => 'Lebanon',
-		'LS' => 'Lesotho',
-		'LR' => 'Liberia',
-		'LY' => 'Libya',
-		'LI' => 'Liechtenstein',
-		'LT' => 'Lithuania',
-		'LU' => 'Luxembourg',
-		'MO' => 'Macao',
-		'MK' => 'Macedonia',
-		'MG' => 'Madagascar',
-		'MW' => 'Malawi',
-		'MY' => 'Malaysia',
-		'MV' => 'Maldives',
-		'ML' => 'Mali',
-		'MT' => 'Malta',
-		'MH' => 'Marshall Islands',
-		'MQ' => 'Martinique',
-		'MR' => 'Mauritania',
-		'MU' => 'Mauritius',
-		'YT' => 'Mayotte',
-		'MX' => 'Mexico',
-		'FM' => 'Micronesia, Federated States of',
-		'MD' => 'Moldova, Republic of',
-		'MC' => 'Monaco',
-		'MN' => 'Mongolia',
-		'ME' => 'Montenegro',
-		'MS' => 'Montserrat',
-		'MA' => 'Morocco',
-		'MZ' => 'Mozambique',
-		'MM' => 'Myanmar',
-		'NA' => 'Namibia',
-		'NR' => 'Nauru',
-		'NP' => 'Nepal',
-		'NL' => 'Netherlands',
-		'NC' => 'New Caledonia',
-		'NZ' => 'New Zealand',
-		'NI' => 'Nicaragua',
-		'NE' => 'Niger',
-		'NG' => 'Nigeria',
-		'NU' => 'Niue',
-		'NF' => 'Norfolk Island',
-		'MP' => 'Northern Mariana Islands',
-		'NO' => 'Norway',
-		'OM' => 'Oman',
-		'PK' => 'Pakistan',
-		'PW' => 'Palau',
-		'PS' => 'Palestine, State of',
-		'PA' => 'Panama',
-		'PG' => 'Papua New Guinea',
-		'PY' => 'Paraguay',
-		'PE' => 'Peru',
-		'PH' => 'Philippines',
-		'PN' => 'Pitcairn',
-		'PL' => 'Poland',
-		'PT' => 'Portugal',
-		'PR' => 'Puerto Rico',
-		'QA' => 'Qatar',
-		'RE' => 'Reunion',
-		'RO' => 'Romania',
-		'RU' => 'Russian Federation',
-		'RW' => 'Rwanda',
-		'BL' => 'Saint Barthelemy',
-		'SH' => 'Saint Helena, Ascension and Tristan da Cunha',
-		'KN' => 'Saint Kitts And Nevis',
-		'LC' => 'Saint Lucia',
-		'MF' => 'Saint Martin (French part)',
-		'PM' => 'Saint Pierre And Miquelon',
-		'VC' => 'Saint Vincent and the Grenadines',
-		'WS' => 'Samoa',
-		'SM' => 'San Marino',
-		'ST' => 'Sao Tome And Principe',
-		'SA' => 'Saudi Arabia',
-		'SN' => 'Senegal',
-		'RS' => 'Serbia',
-		'SC' => 'Seychelles',
-		'SL' => 'Sierra Leone',
-		'SG' => 'Singapore',
-		'SX' => 'Saint Vincent and the Grenadines',
-		'SK' => 'Slovakia',
-		'SI' => 'Slovenia',
-		'SB' => 'Solomon Islands',
-		'SO' => 'Somalia',
-		'ZA' => 'South Africa',
-		'GS' => 'South Georgia and the South Sandwich Islands',
-		'SS' => 'South Sudan',
-		'ES' => 'Spain',
-		'LK' => 'Sri Lanka',
-		'SD' => 'Sudan',
-		'SR' => 'Suriname',
-		'SJ' => 'Svalbard and Jan Mayen',
-		'SZ' => 'Swaziland',
-		'SE' => 'Sweden',
-		'CH' => 'Switzerland',
-		'SY' => 'Syrian Arab Republic',
-		'TW' => 'Taiwan',
-		'TJ' => 'Tajikistan',
-		'TZ' => 'Tanzania, United Republic of',
-		'TH' => 'Thailand',
-		'TL' => 'Timor-Leste',
-		'TG' => 'Togo',
-		'TK' => 'Tokelau',
-		'TO' => 'Tonga',
-		'TT' => 'Trinidad And Tobago',
-		'TN' => 'Tunisia',
-		'TR' => 'Turkey',
-		'TM' => 'Turkmenistan',
-		'TC' => 'Turks and Caicos Islands',
-		'TV' => 'Tuvalu',
-		'UG' => 'Uganda',
-		'UA' => 'Ukraine',
-		'AE' => 'United Arab Emirates',
-		'GB' => 'United Kingdom',
-		'US' => 'United States',
-		'UM' => 'United States Minor Outlying Islands',
-		'UY' => 'Uruguay',
-		'UZ' => 'Uzbekistan',
-		'VU' => 'Vanuatu',
-		'VE' => 'Venezuela, Bolivarian Republic of',
-		'VN' => 'Viet Nam',
-		'VG' => 'Virgin Islands, British',
-		'VI' => 'Virgin Islands, U.S.',
-		'WF' => 'Wallis And Futuna',
-		'EH' => 'Western Sahara',
-		'YE' => 'Yemen',
-		'ZM' => 'Zambia',
-		'ZW' => 'Zimbabwe',
+		    'AF' => 'Afghanistan',
+		    'AX' => 'Aland Islands',
+		    'AL' => 'Albania',
+		    'DZ' => 'Algeria',
+		    'AS' => 'American Samoa',
+		    'AD' => 'Andorra',
+		    'AO' => 'Angola',
+		    'AI' => 'Anguilla',
+		    'AQ' => 'Antarctica',
+		    'AG' => 'Antigua and Barbuda',
+		    'AR' => 'Argentina',
+		    'AM' => 'Armenia',
+		    'AW' => 'Aruba',
+		    'AU' => 'Australia',
+		    'AT' => 'Austria',
+		    'AZ' => 'Azerbaijan',
+		    'BS' => 'Bahamas',
+		    'BH' => 'Bahrain',
+		    'BD' => 'Bangladesh',
+		    'BB' => 'Barbados',
+		    'BY' => 'Belarus',
+		    'BE' => 'Belgium',
+		    'BZ' => 'Belize',
+		    'BJ' => 'Benin',
+		    'BM' => 'Bermuda',
+		    'BT' => 'Bhutan',
+		    'BO' => 'Bolivia',
+		    'BQ' => 'Bonaire, Saint Eustatius and Saba',
+		    'BA' => 'Bosnia and Herzegovina',
+		    'BW' => 'Botswana',
+		    'BV' => 'Bouvet Island',
+		    'BR' => 'Brazil',
+		    'IO' => 'British Indian Ocean Territory',
+		    'VG' => 'British Virgin Islands',
+		    'BN' => 'Brunei',
+		    'BG' => 'Bulgaria',
+		    'BF' => 'Burkina Faso',
+		    'BI' => 'Burundi',
+		    'KH' => 'Cambodia',
+		    'CM' => 'Cameroon',
+		    'CA' => 'Canada',
+		    'CV' => 'Cape Verde',
+		    'KY' => 'Cayman Islands',
+		    'CF' => 'Central African Republic',
+		    'TD' => 'Chad',
+		    'CL' => 'Chile',
+		    'CN' => 'China',
+		    'CX' => 'Christmas Island',
+		    'CC' => 'Cocos Islands',
+		    'CO' => 'Colombia',
+		    'KM' => 'Comoros',
+		    'CK' => 'Cook Islands',
+		    'CR' => 'Costa Rica',
+		    'HR' => 'Croatia',
+		    'CU' => 'Cuba',
+		    'CW' => 'Curacao',
+		    'CY' => 'Cyprus',
+		    'CZ' => 'Czech Republic',
+		    'CD' => 'Democratic Republic of the Congo',
+		    'DK' => 'Denmark',
+		    'DJ' => 'Djibouti',
+		    'DM' => 'Dominica',
+		    'DO' => 'Dominican Republic',
+		    'EC' => 'Ecuador',
+		    'EG' => 'Egypt',
+		    'SV' => 'El Salvador',
+		    'GQ' => 'Equatorial Guinea',
+		    'ER' => 'Eritrea',
+		    'EE' => 'Estonia',
+		    'ET' => 'Ethiopia',
+		    'FK' => 'Falkland Islands',
+		    'FO' => 'Faroe Islands',
+		    'FJ' => 'Fiji',
+		    'FI' => 'Finland',
+		    'FR' => 'France',
+		    'GF' => 'French Guiana',
+		    'PF' => 'French Polynesia',
+		    'TF' => 'French Southern Territories',
+		    'GA' => 'Gabon',
+		    'GM' => 'Gambia',
+		    'GE' => 'Georgia',
+		    'DE' => 'Germany',
+		    'GH' => 'Ghana',
+		    'GI' => 'Gibraltar',
+		    'GR' => 'Greece',
+		    'GL' => 'Greenland',
+		    'GD' => 'Grenada',
+		    'GP' => 'Guadeloupe',
+		    'GU' => 'Guam',
+		    'GT' => 'Guatemala',
+		    'GG' => 'Guernsey',
+		    'GN' => 'Guinea',
+		    'GW' => 'Guinea-Bissau',
+		    'GY' => 'Guyana',
+		    'HT' => 'Haiti',
+		    'HM' => 'Heard Island and McDonald Islands',
+		    'HN' => 'Honduras',
+		    'HK' => 'Hong Kong',
+		    'HU' => 'Hungary',
+		    'IS' => 'Iceland',
+		    'IN' => 'India',
+		    'ID' => 'Indonesia',
+		    'IR' => 'Iran',
+		    'IQ' => 'Iraq',
+		    'IE' => 'Ireland',
+		    'IM' => 'Isle of Man',
+		    'IL' => 'Israel',
+		    'IT' => 'Italy',
+		    'CI' => 'Ivory Coast',
+		    'JM' => 'Jamaica',
+		    'JP' => 'Japan',
+		    'JE' => 'Jersey',
+		    'JO' => 'Jordan',
+		    'KZ' => 'Kazakhstan',
+		    'KE' => 'Kenya',
+		    'KI' => 'Kiribati',
+		    'XK' => 'Kosovo',
+		    'KW' => 'Kuwait',
+		    'KG' => 'Kyrgyzstan',
+		    'LA' => 'Laos',
+		    'LV' => 'Latvia',
+		    'LB' => 'Lebanon',
+		    'LS' => 'Lesotho',
+		    'LR' => 'Liberia',
+		    'LY' => 'Libya',
+		    'LI' => 'Liechtenstein',
+		    'LT' => 'Lithuania',
+		    'LU' => 'Luxembourg',
+		    'MO' => 'Macao',
+		    'MK' => 'Macedonia',
+		    'MG' => 'Madagascar',
+		    'MW' => 'Malawi',
+		    'MY' => 'Malaysia',
+		    'MV' => 'Maldives',
+		    'ML' => 'Mali',
+		    'MT' => 'Malta',
+		    'MH' => 'Marshall Islands',
+		    'MQ' => 'Martinique',
+		    'MR' => 'Mauritania',
+		    'MU' => 'Mauritius',
+		    'YT' => 'Mayotte',
+		    'MX' => 'Mexico',
+		    'FM' => 'Micronesia',
+		    'MD' => 'Moldova',
+		    'MC' => 'Monaco',
+		    'MN' => 'Mongolia',
+		    'ME' => 'Montenegro',
+		    'MS' => 'Montserrat',
+		    'MA' => 'Morocco',
+		    'MZ' => 'Mozambique',
+		    'MM' => 'Myanmar',
+		    'NA' => 'Namibia',
+		    'NR' => 'Nauru',
+		    'NP' => 'Nepal',
+		    'NL' => 'Netherlands',
+		    'AN' => 'Netherlands Antilles',
+		    'NC' => 'New Caledonia',
+		    'NZ' => 'New Zealand',
+		    'NI' => 'Nicaragua',
+		    'NE' => 'Niger',
+		    'NG' => 'Nigeria',
+		    'NU' => 'Niue',
+		    'NF' => 'Norfolk Island',
+		    'KP' => 'North Korea',
+		    'MP' => 'Northern Mariana Islands',
+		    'NO' => 'Norway',
+		    'OM' => 'Oman',
+		    'PK' => 'Pakistan',
+		    'PW' => 'Palau',
+		    'PS' => 'Palestinian Territory',
+		    'PA' => 'Panama',
+		    'PG' => 'Papua New Guinea',
+		    'PY' => 'Paraguay',
+		    'PE' => 'Peru',
+		    'PH' => 'Philippines',
+		    'PN' => 'Pitcairn',
+		    'PL' => 'Poland',
+		    'PT' => 'Portugal',
+		    'PR' => 'Puerto Rico',
+		    'QA' => 'Qatar',
+		    'CG' => 'Republic of the Congo',
+		    'RE' => 'Reunion',
+		    'RO' => 'Romania',
+		    'RU' => 'Russia',
+		    'RW' => 'Rwanda',
+		    'BL' => 'Saint Barthelemy',
+		    'SH' => 'Saint Helena',
+		    'KN' => 'Saint Kitts and Nevis',
+		    'LC' => 'Saint Lucia',
+		    'MF' => 'Saint Martin',
+		    'PM' => 'Saint Pierre and Miquelon',
+		    'VC' => 'Saint Vincent and the Grenadines',
+		    'WS' => 'Samoa',
+		    'SM' => 'San Marino',
+		    'ST' => 'Sao Tome and Principe',
+		    'SA' => 'Saudi Arabia',
+		    'SN' => 'Senegal',
+		    'RS' => 'Serbia',
+		    'SC' => 'Seychelles',
+		    'SL' => 'Sierra Leone',
+		    'SG' => 'Singapore',
+		    'SX' => 'Sint Maarten',
+		    'SK' => 'Slovakia',
+		    'SI' => 'Slovenia',
+		    'SB' => 'Solomon Islands',
+		    'SO' => 'Somalia',
+		    'ZA' => 'South Africa',
+		    'GS' => 'South Georgia and the South Sandwich Islands',
+		    'KR' => 'South Korea',
+		    'SS' => 'South Sudan',
+		    'ES' => 'Spain',
+		    'LK' => 'Sri Lanka',
+		    'SD' => 'Sudan',
+		    'SR' => 'Suriname',
+		    'SJ' => 'Svalbard and Jan Mayen',
+		    'SZ' => 'Swaziland',
+		    'SE' => 'Sweden',
+		    'CH' => 'Switzerland',
+		    'SY' => 'Syria',
+		    'TW' => 'Taiwan',
+		    'TJ' => 'Tajikistan',
+		    'TZ' => 'Tanzania',
+		    'TH' => 'Thailand',
+		    'TL' => 'Timor-Leste',
+		    'TG' => 'Togo',
+		    'TK' => 'Tokelau',
+		    'TO' => 'Tonga',
+		    'TT' => 'Trinidad and Tobago',
+		    'TN' => 'Tunisia',
+		    'TR' => 'Turkey',
+		    'TM' => 'Turkmenistan',
+		    'TC' => 'Turks and Caicos Islands',
+		    'TV' => 'Tuvalu',
+		    'VI' => 'U.S. Virgin Islands',
+		    'UG' => 'Uganda',
+		    'UA' => 'Ukraine',
+		    'AE' => 'United Arab Emirates',
+		    'GB' => 'United Kingdom',
+		    'US' => 'United States',
+		    'UM' => 'United States Minor Outlying Islands',
+		    'UY' => 'Uruguay',
+		    'UZ' => 'Uzbekistan',
+		    'VU' => 'Vanuatu',
+		    'VA' => 'Vatican',
+		    'VE' => 'Venezuela',
+		    'VN' => 'Vietnam',
+		    'WF' => 'Wallis and Futuna',
+		    'EH' => 'Western Sahara',
+		    'YE' => 'Yemen',
+		    'ZM' => 'Zambia',
+		    'ZW' => 'Zimbabwe'
 	);
-	
-	
+
 	public static function map($code)
 	{
-		return (isset(static::$countries[$code])) ? static::$countries[$code] : 'Unknown';
+		return (isset(static::$countries[strtoupper($code)])) ? static::$countries[strtoupper($code)] : $code;
 	}
 	
 	public static function isValid($code)
 	{
-		return isset(static::$countries[$code]);
+		return isset(static::$countries[strtoupper($code)]);
 	}
 	
 	public static function select($class = '', $name = 'country', $selected = null)