Added country code & number handling
Merge pull request #44 from robink/master

In the validator: add country code & number handling