Change to permit international numbers
Merge branch 's0ckz-master'