Change to permit international numbers
Merge branch 's0ckz-master'
Final (I hope) changes to permit international country codes