handle phone numbers with extension
Merge branch 'master' into test