Merge pull request #1 from seamyd/use_official_country_codes

Use official country codes
Merge branch 'master' into use_official_country_codes