Country codes

fixes #701 did this in a bit of a hurry, i have to update regex etc, but this should work for now.
Sigh. Yes it will. Thanks for the heads up @mwmiller