Country codes

fixes #701 did this in a bit of a hurry, i have to update regex etc, but this should work for now.
@moollaza Just a note that this will further exacerbate the Locale warnings.