Fixed handling PhoneNumbers with special chars
Merge remote-tracking branch 'origin/master'